Commit 7a043806 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 87fd69aa
Pipeline #28375 skipped
......@@ -3,8 +3,10 @@
"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[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[it]": "Questa estensione permette di configurare la scadenza del cestino per ogni account.",
"Description[nl]": "Deze plug-in stelt u in staat om de prullenbak laten verlopen te configureren voor elk account.",
"Description[pt]": "Este 'plugin' permite-lhe configurar a expiração da pasta do lixo para cada conta.",
"Description[pt_BR]": "Este plugin permite a você configurar a expiração da pasta da Lixeira para cada conta.",
......@@ -15,8 +17,10 @@
"Name": "Expire Trash Folder",
"Name[ca@valencia]": "Caducitat de la carpeta paperera",
"Name[ca]": "Caducitat de la carpeta paperera",
"Name[es]": "Expirar la carpeta de la papelera",
"Name[fi]": "Vanhenna roskakorikansio",
"Name[fr]": "Expiration du dossier de corbeille",
"Name[it]": "Effettua scadenza del cestino",
"Name[nl]": "Prullenbak laten verlopen",
"Name[pt]": "Expirar a Pasta do Lixo",
"Name[pt_BR]": "Expirar pasta da Lixeira",
......
......@@ -3,6 +3,9 @@
"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[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.",
"Description[nl]": "Deze plug-in stelt u in staat om mapinstellingen te configureren.",
"Description[pt]": "Este 'plugin' permite-lhe configurar as definições da pasta.",
"Description[pt_BR]": "Este plugin permite a você fazer as configurações da pasta.",
......@@ -13,6 +16,9 @@
"Name": "Folder Settings",
"Name[ca@valencia]": "Paràmetres de les carpetes",
"Name[ca]": "Paràmetres de les carpetes",
"Name[es]": "Preferencias de carpetas",
"Name[fr]": "Paramètres du dossier",
"Name[it]": "Impostazioni della cartella",
"Name[nl]": "Mapinstellingen",
"Name[pt]": "Configuração da Pasta",
"Name[pt_BR]": "Configurações da pasta",
......
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