From: l10n daemon script <scripty@kde.org>
Date: Wed, 4 May 2022 01:46:27 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/506cdf329c3e1de5a876f0c562b4d46a2a96a657

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 825e51854..e5e1914e3 100644
--- 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_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",
         "Description[sv]": "Anpassa filhanterarens allmänna inställningar",
@@ -28,6 +29,7 @@
         "Name[fr]": "Général",
         "Name[it]": "Generale",
         "Name[nl]": "Algemeen",
+        "Name[pt_BR]": "Geral",
         "Name[ro]": "Generale",
         "Name[sl]": "Splošno",
         "Name[sv]": "Allmänt",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index f5254d096..26f696651 100644
--- 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_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",
         "Description[sv]": "Anpassa filhanterarens navigering",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index cd2e83e94..ea8b685ba 100644
--- 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_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",
         "Description[sv]": "Anpassa filhanterarens visningslägen",