Commit ca70bff3 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 f4dfdad8
......@@ -4,6 +4,7 @@
"Name": "SendMail Mail Transport",
"Name[ca@valencia]": "Transport de correu SendMail",
"Name[ca]": "Transport de correu SendMail",
"Name[cs]": "Přenos pošty SendMail",
"Name[es]": "Transporte de correo SendMai",
"Name[fr]": "Transport de courrier électronique SendMail",
"Name[it]": "Trasporto della posta SendMail",
......
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