Commit 25a6b460 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 ba79bf53
......@@ -7,6 +7,7 @@
"Name[nl]": "E-mailtransport SendMail",
"Name[pt]": "Transporte de E-Mail do SendMail",
"Name[sv]": "SendMail e-postöverföring",
"Name[tr]": "SenMail Posta İletimi",
"Name[uk]": "Надсилання пошти SendMail",
"Name[x-test]": "xxSendMail 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