Commit bb518241 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 8e33b9d7
......@@ -23,6 +23,7 @@ Name[it]=Leggi CD Audio con Dragon Player
Name[ko]=Dragon Player로 오디오 CD 열기
Name[nb]=Spill lyd-CD med Dragon Player
Name[nl]=Met Dragon Player een audio-cd afspelen
Name[nn]=Spel lyd-CD med Dragon Player
Name[pl]=Odtwórz CD z muzyką za pomocą Dragon Player
Name[pt]=Reproduzir o CD de Áudio com o Dragon Player
Name[pt_BR]=Reproduzir CD de áudio com o 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