Commit 79b9952a 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 f532c064
Pipeline #34859 skipped
......@@ -4,8 +4,10 @@
"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[en_GB]": "This plugin allows you to import/export Windows Contacts.",
"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[ia]": "Iste plugin te permitte importar/exportar contactos de Windows .",
"Description[it]": "Questa estensione permette di importare ed esportare contatti di Windows.",
"Description[ko]": "이 플러그인은 Windows 연락처를 가져오거나 내보냅니다.",
"Description[nl]": "Deze plug-in stelt u in staat Windows-contactpersonen te importeren/exporteren.",
......@@ -21,8 +23,10 @@
"Name[ca@valencia]": "Importa/exporta un Contact del Windows",
"Name[ca]": "Importa/exporta un Contact del Windows",
"Name[cs]": "Importovat/Exportovat kontakty Windows",
"Name[en_GB]": "Import/Export Windows Contact",
"Name[es]": "Importar/Exportar contactos de Windows",
"Name[fr]": "Import / export de contacts « Windows »",
"Name[ia]": "Importa/exporta contacto de Windows",
"Name[it]": "Importa/esporta contatti di Windows",
"Name[ko]": "Windows 연락처 가져오기/내보내기",
"Name[nl]": "Windowscontactpersoon importeren/exporteren",
......
......@@ -3,9 +3,11 @@
"Description": "This plugin allows you to configure expire trash folder for each accounts.",
"Description[ca@valencia]": "Aquest connector permet configurar la caducitat de la carpeta paperera per cada compte.",
"Description[ca]": "Aquest connector permet configurar la caducitat de la carpeta paperera per cada compte.",
"Description[en_GB]": "This plugin allows you to configure expire wastebin folder for each accounts.",
"Description[es]": "Este complemento le permite configurar la expiración de la carpeta de papelera para cada cuenta.",
"Description[fi]": "Tällä liitännäisellä voi vanhentaa kunkin tilin roskakorikansion.",
"Description[fr]": "Ce module externe vous permet de configurer l'expiration du dossier de corbeille pour chaque compte.",
"Description[ia]": "Iste plugin te permitte configurar le dossir de corbe de expirar per cata contos.",
"Description[it]": "Questa estensione permette di configurare la scadenza del cestino per ogni account.",
"Description[ko]": "이 플러그인은 계정별로 휴지통 폴더를 비울 수 있도록 설정합니다.",
"Description[nl]": "Deze plug-in stelt u in staat om de prullenbak laten verlopen te configureren voor elk account.",
......@@ -18,9 +20,11 @@
"Name": "Expire Trash Folder",
"Name[ca@valencia]": "Caducitat de la carpeta paperera",
"Name[ca]": "Caducitat de la carpeta paperera",
"Name[en_GB]": "Expire Wastebin Folder",
"Name[es]": "Expirar la carpeta de la papelera",
"Name[fi]": "Vanhenna roskakorikansio",
"Name[fr]": "Expiration du dossier de corbeille",
"Name[ia]": "Expira dossier de corbe",
"Name[it]": "Effettua scadenza del cestino",
"Name[ko]": "휴지통 폴더 비우기",
"Name[nl]": "Prullenbak laten verlopen",
......
......@@ -4,8 +4,10 @@
"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[en_GB]": "This plugin allows you to configure folder settings.",
"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[ia]": "Iste plugin te permitte configurar preferentias de dossier.",
"Description[it]": "Questa estensione permette di configurare le impostazioni delle cartelle.",
"Description[ko]": "이 플러그인은 폴더별 설정을 설정합니다.",
"Description[nl]": "Deze plug-in stelt u in staat om mapinstellingen te configureren.",
......@@ -19,8 +21,10 @@
"Name[ca@valencia]": "Paràmetres de les carpetes",
"Name[ca]": "Paràmetres de les carpetes",
"Name[cs]": "Nastavení složky",
"Name[en_GB]": "Folder Settings",
"Name[es]": "Preferencias de carpetas",
"Name[fr]": "Paramètres du dossier",
"Name[ia]": "Preferentias de dossier ",
"Name[it]": "Impostazioni della cartella",
"Name[ko]": "폴더 설정",
"Name[nl]": "Mapinstellingen",
......
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