Commit b4ebf853 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 bf05490d
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
"Name[tr]": "SMTP Posta Aktarımı", "Name[tr]": "SMTP Posta Aktarımı",
"Name[uk]": "Надсилання пошти SMTP", "Name[uk]": "Надсилання пошти SMTP",
"Name[x-test]": "xxSMTP Mail Transportxx", "Name[x-test]": "xxSMTP Mail Transportxx",
"Name[zh_CN]": "SMTP 邮件传输",
"ServiceTypes": [ "ServiceTypes": [
"MailTransport/Plugin" "MailTransport/Plugin"
], ],
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
"Name[tr]": "Akonadi Posta Aktarımı", "Name[tr]": "Akonadi Posta Aktarımı",
"Name[uk]": "Надсилання пошти Akonadi", "Name[uk]": "Надсилання пошти Akonadi",
"Name[x-test]": "xxAkonadi Mail Transportxx", "Name[x-test]": "xxAkonadi Mail Transportxx",
"Name[zh_CN]": "Akonadi 邮件传输",
"ServiceTypes": [ "ServiceTypes": [
"MailTransport/Plugin" "MailTransport/Plugin"
], ],
......
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