Commit b6a3dbcc 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 8bfe6801
......@@ -6,6 +6,7 @@
"Description[en_GB]": "This plugin allows you to insert special text as attachment name, emails etc.",
"Description[es]": "Este complemento le permite insertar texto especial como nombre de adjunto, correo electrónico, etc.",
"Description[et]": "See plugin võimaldab lisada spetsiaalset teksti, näiteks manusenime, e-kirja jms.",
"Description[fi]": "Tällä liitännäisellä voit lisätä erikoismerkkejä liitteen nimeen, viesteihin jne.",
"Description[fr]": "Ce module permet d'insérer un texte spécial comme nom de pièce jointe, adresse de courriel, etc.",
"Description[gl]": "Este complemento permítelle inserir texto especial como nomes de anexos, enderezos de correo electrónico, etc.",
"Description[it]": "Questa estensione permette di inserire del testo speciale come nomi di allegati, messaggi di posta, ecc.",
......@@ -26,6 +27,7 @@
"Name[en_GB]": "Quick Text",
"Name[es]": "QuickText",
"Name[et]": "Kiirtekst",
"Name[fi]": "Pikateksti",
"Name[fr]": "Texte rapide",
"Name[gl]": "Texto rápido",
"Name[it]": "Testo rapido",
......
......@@ -28,6 +28,7 @@
"Name[en_GB]": "DKIM Checker",
"Name[es]": "Comprobador DKIM",
"Name[et]": "DKIM kontrollija",
"Name[fi]": "DKIM-tarkistus",
"Name[fr]": "Vérificateur DKIM",
"Name[gl]": "Corrector de DKIM",
"Name[it]": "Verificatore DKIM",
......
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