Commit 47251d71 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 34a2cddf
......@@ -14,6 +14,7 @@ Name[fr]=Fichiers audio
Name[gl]=Ficheiros de son
Name[ia]=Files Audio
Name[it]=File audio
Name[ko]=오디오 파일
Name[nl]=Geluidsbestanden
Name[pl]=Pliki dźwiękowe
Name[pt]=Ficheiros de áudio
......
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