Commit 38a9cc44 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 5c6dddbe
Pipeline #56428 skipped
......@@ -3,6 +3,7 @@ IconName=kmail
Comment=Mail Merge Agent
Comment[ca]=Agent per a fusionar el correu
Comment[ca@valencia]=Agent per a fusionar el correu
Comment[en_GB]=Mail Merge Agent
Comment[es]=Agente de fusión de correo
Comment[fr]=Agent de fusion de messages
Comment[ia]=Agente de fusion de posta
......
......@@ -2,6 +2,7 @@
Name=Mail Merge Agent
Name[ca]=Agent per a fusionar el correu
Name[ca@valencia]=Agent per a fusionar el correu
Name[en_GB]=Mail Merge Agent
Name[es]=Agente de fusión de correo
Name[fr]=Agent de fusion de messages
Name[ia]=Agente de fusion de posta
......@@ -17,6 +18,7 @@ Name[x-test]=xxMail Merge Agentxx
Comment=Mail Merge Agent
Comment[ca]=Agent per a fusionar el correu
Comment[ca@valencia]=Agent per a fusionar el correu
Comment[en_GB]=Mail Merge Agent
Comment[es]=Agente de fusión de correo
Comment[fr]=Agent de fusion de messages
Comment[ia]=Agente de fusion de posta
......
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