Commit ef23ea04 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 ff84e288
......@@ -7,6 +7,7 @@
"Name[ca]": "Transport de correu SMTP",
"Name[cs]": "Přenos pošty SMTP",
"Name[de]": "SMTP-E-Mailtransport",
"Name[en_GB]": "SMTP Mail Transport",
"Name[es]": "Transporte de correo SMTP",
"Name[fi]": "SMTP-postinvälitys",
"Name[fr]": "Transport de courrier électronique SMTP",
......@@ -7,6 +7,7 @@
"Name[ca]": "Transport de correu de l'Akonadi",
"Name[cs]": "Přenos pošty Akonadi",
"Name[de]": "Akonadi-E-Mailtransport",
"Name[en_GB]": "Akonadi Mail Transport",
"Name[es]": "Transporte de correo Akonadi",
"Name[fi]": "Akonadin postinvälitys",
"Name[fr]": "Transport de courrier électronique Akonadi",
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