Commit 374829d8 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 9b11b73f
......@@ -50,6 +50,7 @@ Name[sr@ijekavian]=Мобипокетови фајлови
Name[sr@ijekavianlatin]=Mobipocketovi fajlovi
Name[sr@latin]=Mobipocketovi fajlovi
Name[tg]=Файлҳои «Mobipocket»
Name[tr]=Mobipocket Dosyaları
Name[ug]=Mobipocket ھۆججەتلىرى
Name[uk]=Файли Mobipocket
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