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 8a4c602a1fcc535c10cb0c9c268b657512b0ae59..9536dc751d0a72a4a6fb7982c6776cb65300ec17 100644 (file)
--- 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[ia]": "Configura preferentias del gerente general de file",
         "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
         "Description[it]": "Configura le impostazioni generali del gestore dei file",
         "Description[ko]": "일반 파일 관리자 설정",
@@ -32,6 +33,7 @@
         "Name[cs]": "Obecné",
         "Name[es]": "General",
         "Name[fr]": "Général",
+        "Name[ia]": "General",
         "Name[id]": "Umum",
         "Name[it]": "Generale",
         "Name[ko]": "일반",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 71b507874b949283a118f1921c046e93adda3ae3..8d06ab13de290b4b4c35a512f87f3ee93155fcc0 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -7,6 +7,7 @@
         "Description[ca]": "Configura la navegació del gestor de fitxers",
         "Description[es]": "Configurar la navegación del gestor de archivos",
         "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
+        "Description[ia]": "Configura navigation del gerente de file",
         "Description[id]": "Konfigurasikan navigasi pengelola file",
         "Description[it]": "Configura la navigazione col gestore dei file",
         "Description[ko]": "파일 관리자 탐색 설정",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index aa1fcd2e2632198afca09db60555a5e590c2f347..9a59d84d6c1761f9adb1f884e807a5682c3df240 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -7,6 +7,7 @@
         "Description[ca]": "Configura els modes de vista del gestor de fitxers",
         "Description[es]": "Configurar los modos de vistas del gestor de archivos",
         "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
+        "Description[ia]": "Configura le modos de vista del gerente de file",
         "Description[id]": "Konfigurasikan mode tampilan pengelola file",
         "Description[it]": "Configura le viste del gestore dei file",
         "Description[ko]": "파일 관리자 보기 모드 설정",