Commit fc529ad9 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 4e09b368
Pipeline #24259 skipped
......@@ -64,5 +64,6 @@ Name[tr]=E-posta Aktarımı
Name[ug]=خەت(ئېلخەت) ئالاقىسى
Name[uk]=Транспортування пошти
Name[wa]=Berwetaedje d' emile
Name[x-test]=xxMail Transportxx
Name[zh_CN]=邮件传输
Name[zh_TW]=Mail 傳送
......@@ -30,6 +30,7 @@
"Name[sv]": "SMTP e-postöverföring",
"Name[tr]": "SMTP Posta Aktarımı",
"Name[uk]": "Надсилання пошти SMTP",
"Name[x-test]": "xxSMTP Mail Transportxx",
"Name[zh_CN]": "SMTP 邮件传输",
"Name[zh_TW]": "SMTP 郵件傳輸",
"ServiceTypes": [
......
......@@ -30,6 +30,7 @@
"Name[sv]": "Akonadi e-postöverföring",
"Name[tr]": "Akonadi Posta Aktarımı",
"Name[uk]": "Надсилання пошти Akonadi",
"Name[x-test]": "xxAkonadi Mail Transportxx",
"Name[zh_CN]": "Akonadi 邮件传输",
"Name[zh_TW]": "Akonadi 郵件傳輸",
"ServiceTypes": [
......
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