Commit eca51bd9 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 607c7c7f
......@@ -18,6 +18,7 @@
"Name[sr@latin]": "Transport pošte SMTP‑om",
"Name[sr]": "Транспорт поште СМТП‑ом",
"Name[sv]": "SMTP e-postöverföring",
"Name[tr]": "SMTP Posta Aktarımı",
"Name[uk]": "Надсилання пошти SMTP",
"Name[x-test]": "xxSMTP Mail Transportxx",
"ServiceTypes": [
......
......@@ -18,6 +18,7 @@
"Name[sr@latin]": "Transport pošte Akonadijem",
"Name[sr]": "Транспорт поште Аконадијем",
"Name[sv]": "Akonadi e-postöverföring",
"Name[tr]": "Akonadi Posta Aktarımı",
"Name[uk]": "Надсилання пошти Akonadi",
"Name[x-test]": "xxAkonadi Mail Transportxx",
"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