Commit 7f17d87c 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 8b6c4e39
......@@ -16,6 +16,7 @@ Name[it]=File audio
Name[nl]=Geluidsbestanden
Name[pl]=Pliki dźwiękowe
Name[pt]=Ficheiros de áudio
Name[pt_BR]=Arquivos de áudio
Name[sk]=Audio súbory
Name[sl]=Zvočne datoteke
Name[sr]=Звучни фајлови
......
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