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"

5 files changed, 9 insertions, 9 deletions

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 030710cea..d48aff759 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -30,7 +30,7 @@
         "Name[ia]": "Vista de Dolphin",
         "Name[id]": "Tampilan Dolphin",
         "Name[ie]": "Vise de Dolphin",
-        "Name[is]": "Dolphin-sýn",
+        "Name[is]": "Dolphin-yfirlit",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",
         "Name[ka]": "Dolphin -ის ხედი",
diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 8e7523daf..481ee6f40 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -30,7 +30,7 @@ Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
 Name[ie]=Icones
-Name[is]=Táknmyndir
+Name[is]=Tákn
 Name[it]=Icone
 Name[ja]=アイコン
 Name[ka]=ხატულები
@@ -92,7 +92,7 @@ Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Ringkas
 Name[ie]=Compact
-Name[is]=Þjappað
+Name[is]=Þétt
 Name[it]=Compatta
 Name[ja]=コンパクト
 Name[ka]=დაპატარავება
@@ -153,7 +153,7 @@ Name[hu]=Részletek
 Name[ia]=Detalios
 Name[id]=Perincian
 Name[ie]=Detallies
-Name[is]=Nánar
+Name[is]=Ítarlegt
 Name[it]=Dettagli
 Name[ja]=詳細
 Name[ka]=დეტალები
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index e8fc86d07..835310b85 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -19,7 +19,7 @@
         "Description[ia]": "Configura preferentias del gerente general de file",
         "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
         "Description[ie]": "Configurar li parametres del gerente de files",
-        "Description[is]": "Sýsla með almennar stillingar skráastjóra",
+        "Description[is]": "Grunnstilla almennar stillingar skráastjóra",
         "Description[it]": "Configura le impostazioni generali del gestore dei file",
         "Description[ka]": "ფაილების მმართველის ზოგადი მორგება",
         "Description[ko]": "일반 파일 관리자 설정",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 08d591d8b..d7607fa30 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -19,7 +19,7 @@
         "Description[ia]": "Configura navigation del gerente de file",
         "Description[id]": "Konfigurasikan navigasi pengelola file",
         "Description[ie]": "Configurar li navigation del gerente de files",
-        "Description[is]": "Stilla flakkstýringar skráastjóra",
+        "Description[is]": "Grunnstilla flakk um skráakerfi",
         "Description[it]": "Configura la navigazione col gestore dei file",
         "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება",
         "Description[ko]": "파일 관리자 탐색 설정",
@@ -65,7 +65,7 @@
         "Name[ia]": "Navigation",
         "Name[id]": "Navigasi",
         "Name[ie]": "Navigation",
-        "Name[is]": "Flakk",
+        "Name[is]": "Skoðun",
         "Name[it]": "Navigazione",
         "Name[ja]": "ナビゲーション",
         "Name[ka]": "ნავიგაცია",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 4feceab15..0ce917ad8 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -19,7 +19,7 @@
         "Description[ia]": "Configura le modos de vista del gerente de file",
         "Description[id]": "Konfigurasikan mode tampilan pengelola file",
         "Description[ie]": "Configurar li modes de vise del gerente de files",
-        "Description[is]": "Stilla skoðunarhami í skráastjóra",
+        "Description[is]": "Grunnstilla yfirlitssnið í skráastjóra",
         "Description[it]": "Configura le viste del gestore dei file",
         "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება",
         "Description[ko]": "파일 관리자 보기 모드 설정",
@@ -64,7 +64,7 @@
         "Name[ia]": "Modos de vista",
         "Name[id]": "Mode Tampilan",
         "Name[ie]": "Modes de vise",
-        "Name[is]": "Skoðunarhamir",
+        "Name[is]": "Yfirlitssnið",
         "Name[it]": "Viste",
         "Name[ja]": "表示モード",
         "Name[ka]": "ნახვის რეჟიმები",