Commit 91dc8a67 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 319c8ee9
Pipeline #53459 skipped
[Desktop Entry]
Name=Mail Merge Agent
Name[ca]=Agent per a fusionar el correu
Name[ca@valencia]=Agent per a fusionar el correu
Name[es]=Agente de fusión de correo
Name[fr]=Agent de fusion de messages
Name[it]=Agente per l'unione della posta
Name[nl]=Agent voor samenvoegen in e-mail
Name[pl]=Usługa scalania poczty
Name[pt]=Agente de Junção de E-mail
Name[sl]=Posrednik za zlivanje pošte
Name[sv]=Postsammanfogningsmodul
......@@ -11,9 +14,12 @@ Name[uk]=Агент об'єднання пошти
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[es]=Agente de fusión de correo
Comment[fr]=Agent de fusion de messages
Comment[it]=Agente per l'unione della posta
Comment[nl]=Agent voor samenvoegen in e-mail
Comment[pl]=Usługa scalania poczty
Comment[pt]=Agente de Junção de E-mail
Comment[sl]=Posrednik za zlivanje pošte
Comment[sv]=Postsammanfogningsmodul
......
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