Commit 71e08470 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 91506512
......@@ -2,6 +2,7 @@
"KPlugin": {
"Id": "smtpmailtransport",
"Name": "SMTP Mail Transport",
"Name[ast]": "Tresporte de corréu SMTP",
"Name[ca@valencia]": "Transport de correu SMTP",
"Name[ca]": "Transport de correu SMTP",
"Name[cs]": "Přenos pošty SMTP",
......@@ -2,6 +2,7 @@
"KPlugin": {
"Id": "akonadimailtransport",
"Name": "Akonadi Mail Transport",
"Name[ast]": "Tresporte de corréu d'Akonadi",
"Name[ca@valencia]": "Transport de correu de l'Akonadi",
"Name[ca]": "Transport de correu de l'Akonadi",
"Name[cs]": "Přenos pošty Akonadi",
Supports Markdown
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