Commit 9c7d4917 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 c9aef2cb
......@@ -11,6 +11,7 @@
"Name[nl]": "E-mailtransport SMTP",
"Name[pt]": "Transporte de E-mail SMTP",
"Name[sk]": "Prenos pošty SMTP",
"Name[sl]": "Prenos pošte SMTP",
"Name[sr@ijekavian]": "Транспорт поште СМТП‑ом",
"Name[sr@ijekavianlatin]": "Transport pošte SMTP‑om",
"Name[sr@latin]": "Transport pošte SMTP‑om",
......@@ -11,6 +11,7 @@
"Name[nl]": "Akonadi e-mailtransport",
"Name[pt]": "Transporte de E-mail do Akonadi",
"Name[sk]": "Prenos pošty Akonadi",
"Name[sl]": "Prenos pošte Akonadi",
"Name[sr@ijekavian]": "Транспорт поште Аконадијем",
"Name[sr@ijekavianlatin]": "Transport pošte Akonadijem",
"Name[sr@latin]": "Transport pošte Akonadijem",
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