Commit 1a48b68f 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 3ddbe59c
......@@ -10,6 +10,7 @@
"Name[es]": "Transporte de correo SMTP",
"Name[fr]": "Transport de courrier électronique SMTP",
"Name[it]": "Trasporto della posta SMTP",
"Name[ko]": "SMTP 메일 전송",
"Name[nl]": "E-mailtransport SMTP",
"Name[pl]": "Serwery pocztowe SMTP",
"Name[pt]": "Transporte de E-mail SMTP",
......
......@@ -10,6 +10,7 @@
"Name[es]": "Transporte de correo Akonadi",
"Name[fr]": "Transport de courrier électronique Akonadi",
"Name[it]": "Trasporto della posta di Akonadi",
"Name[ko]": "Akonadi 메일 전송",
"Name[nl]": "Akonadi e-mailtransport",
"Name[pl]": "Serwery pocztowe Akonadi",
"Name[pt]": "Transporte de E-mail do 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