Commit 03f887f6 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 dee312e3
......@@ -9,6 +9,7 @@ Name[de]=Audio-Dateien
Name[el]=Αρχεία ήχου
Name[en_GB]=Audio files
Name[es]=Archivos de sonido
Name[fr]=Fichiers audio
Name[gl]=Ficheiros de son
Name[ia]=Files Audio
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