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 8a068751cb25f053400731ab9e10254b437aee55..fb440b7a21c0a9850ea1fe91d9cc5690faff938a 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -15,6 +15,7 @@
         "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[is]": "Sýsla með almennar stillingar skráastjóra",
         "Description[it]": "Configura le impostazioni generali del gestore dei file",
         "Description[ko]": "일반 파일 관리자 설정",
         "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
@@ -49,6 +50,7 @@
         "Name[fr]": "Général",
         "Name[ia]": "General",
         "Name[id]": "Umum",
+        "Name[is]": "Almennt",
         "Name[it]": "Generale",
         "Name[ko]": "일반",
         "Name[nl]": "Algemeen",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 33793285072967bc3e4c1f6a17b130420f096c7e..b747cc8da6046ef4044fda46f9cd62df2d4a39e8 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -15,6 +15,7 @@
         "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[is]": "Stilla flakkstýringar skráastjóra",
         "Description[it]": "Configura la navigazione col gestore dei file",
         "Description[ko]": "파일 관리자 탐색 설정",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index c4cc111ba3746c981d93bae04a7b3934cfee64fe..dacd44c735a63996b6827c53f4bff009618b089c 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -15,6 +15,7 @@
         "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[is]": "Stilla skoðunarhami í skráastjóra",
         "Description[it]": "Configura le viste del gestore dei file",
         "Description[ko]": "파일 관리자 보기 모드 설정",
         "Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
@@ -56,7 +57,7 @@
         "Name[hu]": "Nézetmódok",
         "Name[ia]": "Modos de vista",
         "Name[id]": "Mode Tampilan",
-        "Name[is]": "Skoðunarhamur",
+        "Name[is]": "Skoðunarhamir",
         "Name[it]": "Viste",
         "Name[ja]": "表示モード",
         "Name[ko]": "보기 모드",