Commit c148179a 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 a68b4588
......@@ -5,6 +5,7 @@
"Name[ca@valencia]": "Transport de correu SMTP",
"Name[ca]": "Transport de correu SMTP",
"Name[cs]": "Přenos pošty SMTP",
"Name[it]": "Trasporto della posta SMTP",
"Name[nl]": "E-mailtransport SMTP",
"Name[pt]": "Transporte de E-mail SMTP",
"Name[sk]": "Prenos pošty SMTP",
......
......@@ -5,6 +5,7 @@
"Name[ca@valencia]": "Transport de correu de l'Akonadi",
"Name[ca]": "Transport de correu de l'Akonadi",
"Name[cs]": "Přenos pošty Akonadi",
"Name[it]": "Trasporto della posta di Akonadi",
"Name[nl]": "Akonadi e-mailtransport",
"Name[pt]": "Transporte de E-mail do Akonadi",
"Name[sk]": "Prenos pošty 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