From 1a8be1544d791e098256cfa5e2ab045e44d42320 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 Apr 2022 01:42:27 +0000 Subject: 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" --- src/settings/kcm/kcmdolphingeneral.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') 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", -- cgit v1.3