From 2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 May 2022 01:59:30 +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 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index bd7bff9ab..bb5b5d10b 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -7,6 +7,7 @@ "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[id]": "Konfigurasikan pengaturan pengelola file umum", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ko]": "일반 파일 관리자 설정", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", @@ -30,6 +31,7 @@ "Name[cs]": "Obecné", "Name[es]": "General", "Name[fr]": "Général", + "Name[id]": "Umum", "Name[it]": "Generale", "Name[ko]": "일반", "Name[nl]": "Algemeen", -- cgit v1.3