Commit 6f1ea4f9 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 02e0c965
......@@ -42,6 +42,5 @@ Name[sv]=Amerikansk engelska
Name[tg]=Англисии ИМА
Name[tr]=ABD İngilizcesi
Name[uk]=Англійська (США)
Name[x-test]=xxUS Englishxx
Name[zh_CN]=美国英语
Name[zh_TW]=美式英文
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