┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphingeneral.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2022-04-30 01:42:27 +0000
committerl10n daemon script <[email protected]>2022-04-30 01:42:27 +0000
commit1a8be1544d791e098256cfa5e2ab045e44d42320 (patch)
treedf033505a9ca98413b82b61241c48de7822760c8 /src/settings/kcm/kcmdolphingeneral.json
parent776d746c6795b19dd5e21390654a69bce3c4dc3f (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.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 3cd24c02c..17f6e9e5a 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -6,7 +6,9 @@
"Description[ca]": "Configura les opcions generals del gestor de fitxers",
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
"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[sl]": "Postavi splošne nastavitve upravljalnika datotek",
"Description[sv]": "Anpassa filhanterarens allmänna inställningar",
"Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
"Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır",
@@ -20,7 +22,9 @@
"Name[ca]": "General",
"Name[es]": "General",
"Name[fr]": "Général",
+ "Name[it]": "Generale",
"Name[nl]": "Algemeen",
+ "Name[sl]": "Splošno",
"Name[sv]": "Allmänt",
"Name[ta]": "பொதுவானவை",
"Name[tr]": "Genel",