Commit 3bd070fd 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 56a89c3c
Pipeline #68225 skipped
......@@ -3,6 +3,7 @@
"Description": "This plugin allows you to check if we want to delete specific email",
"Description[ca@valencia]": "Aquest connector permet comprovar si es vol suprimir un correu electrònic específic",
"Description[ca]": "Aquest connector permet comprovar si es vol suprimir un correu electrònic específic",
"Description[cs]": "Tento modul umožňuje rozhodnout zda smazat vybraný e-mail",
"Description[es]": "Este complemento le permite comprobar si desea borrar el correo indicado",
"Description[fr]": "Ce module externe vous permet de confirmer que nous voulons vraiment supprimer un courriel spécifique.",
"Description[nl]": "Deze plugin biedt u te controleren of we specifieke e-mail willen verwijderen",
......@@ -17,6 +18,7 @@
"Name": "Confirm Before Deleting Emails",
"Name[ca@valencia]": "Confirma abans de suprimir els correus electrònics",
"Name[ca]": "Confirma abans de suprimir els correus electrònics",
"Name[cs]": "Potvrzovat před smazáním e-mailů",
"Name[es]": "Confirmar antes de borrar correos",
"Name[fr]": "Confirmer avant de la suppression des courriels",
"Name[nl]": "Alvorens e-mails verwijderen bevestigen",
......
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