Commit 036fd81e 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 959ed35c
......@@ -45,6 +45,7 @@ Name[ru]=Электронные книги Mobipocket
Name[si]=Mobipocket ගොනු
Name[sk]=Mobipocket súbory
Name[sl]=Datoteke Mobipocket
Name[sq]=Skedarët Mobipocket
Name[sr]=Мобипокетови фајлови
Name[sr@ijekavian]=Мобипокетови фајлови
Name[sr@ijekavianlatin]=Mobipocketovi fajlovi
......
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