Commit 574fcc2e 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 aabc62c9
......@@ -16,6 +16,7 @@
"Name[nl]": "E-mailtransport SMTP",
"Name[pl]": "Serwery pocztowe SMTP",
"Name[pt]": "Transporte de E-mail SMTP",
"Name[pt_BR]": "Transporte de e-mail SMTP",
"Name[sk]": "Prenos pošty SMTP",
"Name[sl]": "Prenos pošte SMTP",
"Name[sr@ijekavian]": "Транспорт поште СМТП‑ом",
......@@ -16,6 +16,7 @@
"Name[nl]": "Akonadi e-mailtransport",
"Name[pl]": "Serwery pocztowe Akonadi",
"Name[pt]": "Transporte de E-mail do Akonadi",
"Name[pt_BR]": "Transporte de e-mail do Akonadi",
"Name[sk]": "Prenos pošty Akonadi",
"Name[sl]": "Prenos pošte Akonadi",
"Name[sr@ijekavian]": "Транспорт поште Аконадијем",
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