Commit 11e5303d 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 44bc1392
......@@ -6,6 +6,7 @@ Name[ca]=Fitxers d'àudio
Name[ca@valencia]=Fitxers d'àudio
Name[cs]=Audio soubory
Name[en_GB]=Audio files
Name[es]=Archivos de sonido
Name[it]=File audio
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