┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphingeneral.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2022-05-04 01:46:27 +0000
committerl10n daemon script <[email protected]>2022-05-04 01:46:27 +0000
commit506cdf329c3e1de5a876f0c562b4d46a2a96a657 (patch)
tree3ccd4d6675dee13ac3aeeff6afb4244660425479 /src/settings/kcm/kcmdolphingeneral.json
parentd958aa57d87ba1b391bac8043949f49fb23fb43c (diff)
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"
Diffstat (limited to 'src/settings/kcm/kcmdolphingeneral.json')
-rw-r--r--src/settings/kcm/kcmdolphingeneral.json2
1 files changed, 2 insertions, 0 deletions
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",