Commit 717d1dec 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 cf775755
Pipeline #33188 skipped
......@@ -4,7 +4,7 @@
"Description[ar]": "تتيح لك هذه الملحقة استيراد وتصدير متراسلي LDAP.",
"Description[ca@valencia]": "Aquest connector permet importar o exportar els contactes LDAP.",
"Description[ca]": "Aquest connector permet importar o exportar els contactes LDAP.",
"Description[cs]": "Tento modul umožňuje import/export kontakt; LDAP.",
"Description[cs]": "Tento modul umožňuje import/export kontaktů LDAP.",
"Description[de]": "Mit diesem Modul können Sie LDAP-Kontakte importieren oder exportieren.",
"Description[en_GB]": "This plugin allows you to import/export LDAP contacts.",
"Description[es]": "Este complemento le permite importar/exportar contactos LDAP.",
......
......@@ -3,6 +3,7 @@
"Description": "This plugin allows you to import/export Windows Contacts.",
"Description[ca@valencia]": "Aquest connector permet importar/exportar els contactes de Windows.",
"Description[ca]": "Aquest connector permet importar/exportar els contactes de Windows.",
"Description[cs]": "Tento modul umožňuje import/export kontaktů Windows.",
"Description[es]": "Este complemento le permite importar/exportar contactos de Windows.",
"Description[fr]": "Ce module externe vous permet d'importer / exporter des contacts « Windows ».",
"Description[nl]": "Deze plug-in stelt u in staat Windows-contactpersonen te importeren/exporteren.",
......@@ -17,6 +18,7 @@
"Name": "Import/Export Windows Contact",
"Name[ca@valencia]": "Importa/exporta un Contact del Windows",
"Name[ca]": "Importa/exporta un Contact del Windows",
"Name[cs]": "Importovat/Exportovat kontakty Windows",
"Name[es]": "Importar/Exportar contactos de Windows",
"Name[fr]": "Import / export de contacts « Windows »",
"Name[nl]": "Windowscontactpersoon importeren/exporteren",
......
......@@ -3,6 +3,7 @@
"Description": "This plugin allows you to configure folder settings.",
"Description[ca@valencia]": "Aquest connector permet configurar els paràmetres de les carpetes.",
"Description[ca]": "Aquest connector permet configurar els paràmetres de les carpetes.",
"Description[cs]": "Tento modul umožňuje nastavit volby složek.",
"Description[es]": "Este complemento le permite configurar las propiedades de las carpetas.",
"Description[fr]": "Ce module externe vous permet de configurer les paramètres du dossier.",
"Description[it]": "Questa estensione permette di configurare le impostazioni delle cartelle.",
......@@ -16,6 +17,7 @@
"Name": "Folder Settings",
"Name[ca@valencia]": "Paràmetres de les carpetes",
"Name[ca]": "Paràmetres de les carpetes",
"Name[cs]": "Nastavení složky",
"Name[es]": "Preferencias de carpetas",
"Name[fr]": "Paramètres du dossier",
"Name[it]": "Impostazioni della cartella",
......
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