Commit bcd6eb3a 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 98bc728f
......@@ -12,6 +12,7 @@ Name[ca@valencia]=Reprodueix CD d'àudio amb el Dragon Player
Name[cs]=Přehrát Audio CD pomocí přehrávače Dragon
Name[da]=Afspil lydcd med Dragon Player
Name[de]=Audio-CD mit Dragon Player abspielen
Name[el]=Αναπαραγωγή CD ήχου με το Dragon Player
Name[en_GB]=Play Audio CD using Dragon Player
Name[es]=Reproducir CD de audio con Dragon Player
Name[et]=Audio CD esitamine Dragoni mängijaga
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