Commit dab5a54b 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 249c9b62
......@@ -2,6 +2,7 @@
"KPlugin": {
"Id": "sendmailtransport",
"Name": "SendMail Mail Transport",
"Name[ca@valencia]": "Transport de correu SendMail",
"Name[ca]": "Transport de correu SendMail",
"Name[nl]": "E-mailtransport SendMail",
"Name[pt]": "Transporte de E-Mail do SendMail",
......
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