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"

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index e5e1914e3c0e1ae7f291861f0dfb84a210f0e52d..fdc64528fbaf31cbcfbc0392015d27c6892fcb80 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -9,6 +9,7 @@
         "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
         "Description[it]": "Configura le impostazioni generali del gestore dei file",
         "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
+        "Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
         "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
         "Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere",
         "Description[sl]": "Postavi splošne nastavitve upravljalnika datotek",
@@ -29,6 +30,7 @@
         "Name[fr]": "Général",
         "Name[it]": "Generale",
         "Name[nl]": "Algemeen",
+        "Name[pt]": "Geral",
         "Name[pt_BR]": "Geral",
         "Name[ro]": "Generale",
         "Name[sl]": "Splošno",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 26f696651be8c7aca0df6e2463332176ccda4442..5e3f1dbebfdac6fe0b41162f3afd86525e3b7b17 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -9,6 +9,7 @@
         "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
         "Description[it]": "Configura la navigazione col gestore dei file",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",
+        "Description[pt]": "Configurar a navegação do gestor de ficheiros",
         "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
         "Description[ro]": "Configurează navigarea cu gestionarul de fișiere",
         "Description[sl]": "Postavi krmarjenje v upravljalniku datotek",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index ea8b685ba49a4c46dd0b29d6b9c54bdb5e9fa490..6c3d666cbaa1ff68e7d3d588661e6e397d333789 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -9,6 +9,7 @@
         "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
         "Description[it]": "Configura le viste del gestore dei file",
         "Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
+        "Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
         "Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",
         "Description[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere",
         "Description[sl]": "Postavi načine prikaza upravljalnika datotek",