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.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 68fc057a23c171b8b14611e515999d3a23d1c69d..76f67fb5ae1fa187e7632a643b48052c94df816c 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare le impostazioni generali di
 Comment[ja]=Dolphin の全般的な設定を行います
 Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다.
 Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus.
 Comment[ja]=Dolphin の全般的な設定を行います
 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[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[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
 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.


@@ -112,6 +113,7 @@ Comment[it]=Configura le impostazioni generali del gestore dei file
 Comment[ja]=ファイルマネージャの全般的な設定を行います
 Comment[ko]=일반 파일 관리자 설정
 Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas
 Comment[ja]=ファイルマネージャの全般的な設定を行います
 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[pl]=Ustawienia ogólne zarządzania plikami
 Comment[pt]=Configurar as definições gerais do gestor de ficheiros
 Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
 Comment[pl]=Ustawienia ogólne zarządzania plikami
 Comment[pt]=Configurar as definições gerais do gestor de ficheiros

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 7e64f841b0006a09ff8fbe592be7b5e79828b727..5f220f64093ab8855a1a47f2e895eaa8e7f3fdeb 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.
 Comment[ja]=Dolphin でのナビゲーションを設定します
 Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다.
 Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją.
 Comment[ja]=Dolphin でのナビゲーションを設定します
 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[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[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
 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.

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 70e422cf30c0bb2aa90a77341d15f2c9a37cd7cf..2f09e5dfebb5bac1b7602a1701ed47fa507ef483 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -11,6 +11,7 @@ Name[it]=Servizi di Dolphin
 Name[ja]=Dolphin サービス
 Name[ko]=Dolphin 서비스
 Name[lt]=Dolphin tarnybos
 Name[ja]=Dolphin サービス
 Name[ko]=Dolphin 서비스
 Name[lt]=Dolphin tarnybos

+Name[nb]=Dolphin-tjenester

 Name[nl]=Dolphin-services
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
 Name[nl]=Dolphin-services
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin


@@ -50,6 +51,7 @@ Name[it]=Servizi
 Name[ja]=サービス
 Name[ko]=서비스
 Name[lt]=Paslaugos
 Name[ja]=サービス
 Name[ko]=서비스
 Name[lt]=Paslaugos

+Name[nb]=Tjenester

 Name[nl]=Services
 Name[pl]=Usługi
 Name[pt]=Serviços
 Name[nl]=Services
 Name[pl]=Usługi
 Name[pt]=Serviços

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index f09a0b1a8ae3ca45653e55afe195eb179586b1ce..aa0251c1a6f1e1b6ac1d6b97de261e02d769f706 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
 Comment[ja]=Dolphin の表示モードを設定します
 Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다.
 Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin rodymo būdus.
 Comment[ja]=Dolphin の表示モードを設定します
 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[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[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
 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.