Commit 3c73089b 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 e3827791
......@@ -5,9 +5,14 @@ Name=Audio files
Name[ca]=Fitxers d'àudio
Name[ca@valencia]=Fitxers d'àudio
Name[cs]=Audio soubory
Name[de]=Audio-Dateien
Name[it]=File audio
Name[nl]=Geluidsbestanden
Name[pt]=Ficheiros de áudio
Name[sr]=Звучни фајлови
Name[sr@ijekavian]=Звучни фајлови
Name[sr@ijekavianlatin]=Zvučni fajlovi
Name[sr@latin]=Zvučni fajlovi
Name[sv]=Ljudfiler
Name[uk]=Звукові файли
Name[x-test]=xxAudio filesxx
......
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