Commit 44bc1392 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 aebd6f64
...@@ -21,6 +21,7 @@ Name[sv]=Ljudfiler ...@@ -21,6 +21,7 @@ Name[sv]=Ljudfiler
Name[tr]=Ses dosyaları Name[tr]=Ses dosyaları
Name[uk]=Звукові файли Name[uk]=Звукові файли
Name[x-test]=xxAudio filesxx Name[x-test]=xxAudio filesxx
Name[zh_TW]=音訊檔案 Name[zh_TW]=音訊檔案
ServiceTypes=ThumbCreator ServiceTypes=ThumbCreator
MimeType=audio/*; MimeType=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