Commit 480ed9ed authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 6e6a0bdc
......@@ -20,6 +20,7 @@ Name[fi]=Toista ääni-CD Dragon Playerissä
Name[fr]=Lire le CD audio avec Dragon Player
Name[gl]=Reproducir un CD de son con Dragon Player
Name[hu]=Hang CD lejátszása a Dragon Playerrel
Name[is]=Spila CD-hljómdisk með Dragon spilaranum
Name[it]=Leggi CD Audio con Dragon Player
Name[ko]=Dragon Player로 오디오 CD 열기
Name[nb]=Spill lyd-CD med Dragon Player
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment