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 fdc64528fbaf31cbcfbc0392015d27c6892fcb80..488760c2b4007dd0f553b54116964867f08bf030 100644 (file)
--- 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 5e3f1dbebfdac6fe0b41162f3afd86525e3b7b17..b84fb310effe17046896e7c6df80be319a800ccf 100644 (file)
--- 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 6c3d666cbaa1ff68e7d3d588661e6e397d333789..3f1d927abf653f492e8600e69572c53a7170b58b 100644 (file)
--- 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",