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, 7 insertions, 0 deletions

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 063ab152f..d1549f2d8 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -118,6 +118,7 @@ Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[nb]=Kompakt
 Name[nl]=Compact
+Name[nn]=Kompakt
 Name[pa]=ਸੰਖਿਪਤ
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index d75020e03..e810ebff9 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -59,6 +59,7 @@ Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다.
 Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus.
 Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin.
 Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
+Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin.
 Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina.
 Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin.
@@ -147,6 +148,7 @@ Comment[ko]=일반 파일 관리자 설정
 Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas
 Comment[nb]=Sett opp generelle innstillinger for filbehandleren
 Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
+Comment[nn]=Set opp generelle innstillingar for filhandsamaren
 Comment[pl]=Ustawienia ogólne zarządzania plikami
 Comment[pt]=Configurar as definições gerais do gestor de ficheiros
 Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 9564c3cfa..da4edb9de 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -59,6 +59,7 @@ Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다.
 Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją.
 Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin.
 Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
+Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin.
 Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
 Comment[pt]=Este serviço permite a configuração da navegação do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin.
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 1e951222d..516cd48d7 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -19,6 +19,7 @@ Name[ko]=Dolphin 서비스
 Name[lt]=Dolphin tarnybos
 Name[nb]=Dolphin-tjenester
 Name[nl]=Dolphin-services
+Name[nn]=Dolphin-tenester
 Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
@@ -68,6 +69,7 @@ Name[ko]=서비스
 Name[lt]=Paslaugos
 Name[nb]=Tjenester
 Name[nl]=Services
+Name[nn]=Tenester
 Name[pa]=ਸੇਵਾਵਾਂ
 Name[pl]=Usługi
 Name[pt]=Serviços
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index da409bab6..394ad535c 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -58,6 +58,7 @@ Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다.
 Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin rodymo būdus.
 Comment[nb]=Med denne tjenesten kan du sette opp Dolphins visningsmåter.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
+Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingsmodusar.
 Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
 Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin.