Commit 223176ab 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 79a09a9e
......@@ -48,6 +48,7 @@
"Name[tr]": "Otomatik Düzeltme",
"Name[uk]": "Автовиправлення",
"Name[x-test]": "xxAutocorrectionxx",
"Name[zh_CN]": "自动更正",
"ServiceTypes": [
"KMailEditor/Plugin"
],
......
......@@ -51,6 +51,7 @@
"Name[tr]": "Büyük Küçük Harf Değiştir",
"Name[uk]": "Змінити регістр",
"Name[x-test]": "xxChange Casexx",
"Name[zh_CN]": "更改大小写",
"ServiceTypes": [
"KMailEditor/Plugin"
],
......
......@@ -53,6 +53,7 @@
"Name[tr]": "Özel Karakter Ekle",
"Name[uk]": "Вставлення спеціального символу",
"Name[x-test]": "xxInsert Special Characterxx",
"Name[zh_CN]": "插入特殊字符",
"ServiceTypes": [
"KMailEditor/Plugin"
],
......
......@@ -47,6 +47,7 @@
"Name[tr]": "Aralıksız Boşluk Ekle",
"Name[uk]": "Вставити нерозривний пробіл",
"Name[x-test]": "xxInsert Non Breaking Spacexx",
"Name[zh_CN]": "插入不换行空格",
"ServiceTypes": [
"KMailEditor/Plugin"
],
......
......@@ -47,6 +47,7 @@
"Name[tr]": "Kişileri Otomatik Ekle",
"Name[uk]": "Автоматичне додавання контактів",
"Name[x-test]": "xxAutomatic Add Contactsxx",
"Name[zh_CN]": "自动添加联系人",
"ServiceTypes": [
"KMailEditor/PluginCheckBeforeSend"
],
......
......@@ -51,6 +51,7 @@
"Name[tr]": "URL Genişlet",
"Name[uk]": "Розгортання адреси",
"Name[x-test]": "xxExpand URLxx",
"Name[zh_CN]": "展开 URL",
"ServiceTypes": [
"MessageViewer/ViewerCommonPlugin"
],
......
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