Commit 5d84bbc3 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 3095890d
...@@ -52,6 +52,7 @@ Name[sv]=Mobipocket-filer ...@@ -52,6 +52,7 @@ Name[sv]=Mobipocket-filer
Name[tr]=Mobipocket Dosyaları Name[tr]=Mobipocket Dosyaları
Name[ug]=Mobipocket ھۆججەتلىرى Name[ug]=Mobipocket ھۆججەتلىرى
Name[uk]=Файли Mobipocket Name[uk]=Файли Mobipocket
Name[x-test]=xxMobipocket Filesxx
Name[zh_CN]=Mobipocket 文件 Name[zh_CN]=Mobipocket 文件
Name[zh_TW]=Mobipocket 檔案 Name[zh_TW]=Mobipocket 檔案
X-KDE-ServiceTypes=ThumbCreator X-KDE-ServiceTypes=ThumbCreator
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