From: l10n daemon script <scripty@kde.org>
Date: Fri, 6 May 2022 01:46:29 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/553cb880c249c34794d694836cc53a7f4bb31858

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"
---

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",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 5e3f1dbeb..b84fb310e 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -8,6 +8,7 @@
         "Description[es]": "Configurar la navegación del gestor de archivos",
         "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
         "Description[it]": "Configura la navigazione col gestore dei file",
+        "Description[ko]": "파일 관리자 탐색 설정",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",
         "Description[pt]": "Configurar a navegação do gestor de ficheiros",
         "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 6c3d666cb..3f1d927ab 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -8,6 +8,7 @@
         "Description[es]": "Configurar los modos de vistas del gestor de archivos",
         "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
         "Description[it]": "Configura le viste del gestore dei file",
+        "Description[ko]": "파일 관리자 보기 모드 설정",
         "Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
         "Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
         "Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",