Commit 2e654ff4 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 b6f13798
Pipeline #61339 skipped
......@@ -6,6 +6,7 @@ Comment[ca@valencia]=Agent per a fusionar el correu
Comment[de]=Agent für Serien- E-Mails
Comment[en_GB]=Mail Merge Agent
Comment[es]=Agente de fusión de correo
Comment[fi]=Viestinkoostamisagentti
Comment[fr]=Agent de fusion de messages
Comment[ia]=Agente de fusion de posta
Comment[it]=Agente per l'unione della posta
......
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Agent per a fusionar el correu
Name[de]=Agent für Serien- E-Mails
Name[en_GB]=Mail Merge Agent
Name[es]=Agente de fusión de correo
Name[fi]=Viestinkoostamisagentti
Name[fr]=Agent de fusion de messages
Name[ia]=Agente de fusion de posta
Name[it]=Agente per l'unione della posta
......@@ -22,6 +23,7 @@ Comment[ca@valencia]=Agent per a fusionar el correu
Comment[de]=Agent für Serien- E-Mails
Comment[en_GB]=Mail Merge Agent
Comment[es]=Agente de fusión de correo
Comment[fi]=Viestinkoostamisagentti
Comment[fr]=Agent de fusion de messages
Comment[ia]=Agente de fusion de posta
Comment[it]=Agente per l'unione della 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