From 553cb880c249c34794d694836cc53a7f4bb31858 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 May 2022 01:46:29 +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 fdc64528f..488760c2b 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -8,6 +8,7 @@ "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[ko]": "일반 파일 관리자 설정", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", "Description[pt]": "Configurar as definições gerais do gestor de ficheiros", "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos", @@ -29,6 +30,7 @@ "Name[es]": "General", "Name[fr]": "Général", "Name[it]": "Generale", + "Name[ko]": "일반", "Name[nl]": "Algemeen", "Name[pt]": "Geral", "Name[pt_BR]": "Geral", -- cgit v1.3.1