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/dolphinpart.desktop b/src/dolphinpart.desktop
index 24ce9c2f40064c94c55498825d89199eedde3f6a..08734f814451c54d9f028ab95f87ced9d9b68cc5 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -10,6 +10,7 @@ Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
 Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin
 Name[gl]=Vista de Dolphin
 Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin

+Name[ja]=Dolphin ビュー

 Name[ko]=Dolphin 보기
 Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
 Name[ko]=Dolphin 보기
 Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave


@@ -52,6 +53,7 @@ Name[fr]=Icônes
 Name[gl]=Iconas
 Name[id]=Ikon
 Name[it]=Icone
 Name[gl]=Iconas
 Name[id]=Ikon
 Name[it]=Icone

+Name[ja]=アイコン

 Name[ko]=아이콘
 Name[nb]=Ikoner
 Name[nl]=Pictogrammen
 Name[ko]=아이콘
 Name[nb]=Ikoner
 Name[nl]=Pictogrammen


@@ -116,6 +118,7 @@ Name[fr]=Détails
 Name[gl]=Detalles
 Name[id]=Detail
 Name[it]=Dettagli
 Name[gl]=Detalles
 Name[id]=Detail
 Name[it]=Dettagli

+Name[ja]=詳細

 Name[ko]=자세히
 Name[nb]=Detaljer
 Name[nl]=Details
 Name[ko]=자세히
 Name[nb]=Detaljer
 Name[nl]=Details

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index cb5afd224f0efa5742999dedfbd6a6eef0f739e5..b9c916faefe2159c2876477fcec08a7d382150df 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -9,6 +9,7 @@ Name[fr]=Dolphin
 Name[gl]=Dolphin
 Name[id]=Dolphin
 Name[it]=Dolphin
 Name[gl]=Dolphin
 Name[id]=Dolphin
 Name[it]=Dolphin

+Name[ja]=Dolphin

 Name[ko]=Dolphin
 Name[nb]=Dolphin
 Name[nl]=Dolphin
 Name[ko]=Dolphin
 Name[nb]=Dolphin
 Name[nl]=Dolphin


@@ -42,6 +43,7 @@ GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
 GenericName[id]=Manajer Berkas
 GenericName[it]=Gestore dei file
 GenericName[gl]=Xestor de ficheiros
 GenericName[id]=Manajer Berkas
 GenericName[it]=Gestore dei file

+GenericName[ja]=ファイルマネージャ

 GenericName[ko]=파일 관리자
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
 GenericName[ko]=파일 관리자
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index cdc096277fd7a0dfbd6eeca8970c4e38c7be354b..8699d8b2177d224120611359b807b37bd46f6b3b 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -8,6 +8,7 @@ Name[fr]=Dolphin général
 Name[gl]=Xerais de Dolphin
 Name[id]=Dolphin Umum
 Name[it]=Impostazioni generali di Dolphin
 Name[gl]=Xerais de Dolphin
 Name[id]=Dolphin Umum
 Name[it]=Impostazioni generali di Dolphin

+Name[ja]=Dolphin 全般

 Name[ko]=Dolphin 일반
 Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen
 Name[ko]=Dolphin 일반
 Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen


@@ -36,6 +37,7 @@ Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphi
 Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin.
 Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin.
 Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin.
 Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin.

+Comment[ja]=Dolphin の全般的な設定を行います

 Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다.
 Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
 Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina.
 Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다.
 Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
 Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina.


@@ -73,6 +75,7 @@ Name[fr]=Général
 Name[gl]=Xerais
 Name[id]=Umum
 Name[it]=Generale
 Name[gl]=Xerais
 Name[id]=Umum
 Name[it]=Generale

+Name[ja]=全般

 Name[ko]=일반
 Name[nb]=Generelt
 Name[nl]=Algemeen
 Name[ko]=일반
 Name[nb]=Generelt
 Name[nl]=Algemeen


@@ -100,6 +103,7 @@ Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers
 Comment[gl]=Configurar opcións xerais de xestores de ficheiros.
 Comment[id]=Konfigurasi pengaturan manajer berkas umum
 Comment[it]=Configura le impostazioni generali del gestore dei file
 Comment[gl]=Configurar opcións xerais de xestores de ficheiros.
 Comment[id]=Konfigurasi pengaturan manajer berkas umum
 Comment[it]=Configura le impostazioni generali del gestore dei file

+Comment[ja]=ファイルマネージャの全般的な設定を行います

 Comment[ko]=일반 파일 관리자 설정
 Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
 Comment[pl]=Ustawienia ogólne zarządzania plikami
 Comment[ko]=일반 파일 관리자 설정
 Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
 Comment[pl]=Ustawienia ogólne zarządzania plikami

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index ca83f2a8893e9956637ebe790d3a3017f0e22840..42537580076e10f925b8870b265fa8644109c9d8 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -8,6 +8,7 @@ Name[fr]=Navigation avec Dolphin
 Name[gl]=Navegación de Dolphin
 Name[id]=Navigasi Dolphin
 Name[it]=Navigazione di Dolphin
 Name[gl]=Navegación de Dolphin
 Name[id]=Navigasi Dolphin
 Name[it]=Navigazione di Dolphin

+Name[ja]=Dolphin ナビゲーション

 Name[ko]=Dolphin 탐색
 Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie
 Name[ko]=Dolphin 탐색
 Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie


@@ -36,6 +37,7 @@ Comment[fr]=Ce service permet de configurer la navigation avec Dolphin.
 Comment[gl]=Este servizo permite configurar a navegación de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin.
 Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.
 Comment[gl]=Este servizo permite configurar a navegación de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin.
 Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.

+Comment[ja]=Dolphin でのナビゲーションを設定します

 Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다.
 Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
 Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
 Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다.
 Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
 Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.


@@ -72,6 +74,7 @@ Name[fr]=Navigation
 Name[gl]=Navegación
 Name[id]=Navigasi
 Name[it]=Navigazione
 Name[gl]=Navegación
 Name[id]=Navigasi
 Name[it]=Navigazione

+Name[ja]=ナビゲーション

 Name[ko]=탐색
 Name[nb]=Navigasjon
 Name[nl]=Navigatie
 Name[ko]=탐색
 Name[nb]=Navigasjon
 Name[nl]=Navigatie


@@ -100,6 +103,7 @@ Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers
 Comment[gl]=Configurar a navegación do xestor de ficheiros.
 Comment[id]=Konfigurasi navigasi manajer berkas
 Comment[it]=Configura la navigazione col gestore dei file
 Comment[gl]=Configurar a navegación do xestor de ficheiros.
 Comment[id]=Konfigurasi navigasi manajer berkas
 Comment[it]=Configura la navigazione col gestore dei file

+Comment[ja]=ファイルマネージャでのナビゲーションを設定します

 Comment[ko]=파일 관리자 탐색 설정
 Comment[nb]=Sett opp navigasjon i filbehandleren
 Comment[nl]=Bestandsbeheerdernavigatie configureren
 Comment[ko]=파일 관리자 탐색 설정
 Comment[nb]=Sett opp navigasjon i filbehandleren
 Comment[nl]=Bestandsbeheerdernavigatie configureren

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index bb4e7680cbe65b0d567e84210464cecebe0b649f..f130b37ae8e946e835ff175e12a79a4a8a51e2a4 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -8,6 +8,7 @@ Name[fr]=Services de Dolphin
 Name[gl]=Servizos de Dolphin
 Name[id]=Layanan Dolphin
 Name[it]=Servizi di Dolphin
 Name[gl]=Servizos de Dolphin
 Name[id]=Layanan Dolphin
 Name[it]=Servizi di Dolphin

+Name[ja]=Dolphin サービス

 Name[ko]=Dolphin 서비스
 Name[nl]=Dolphin-services
 Name[pl]=Usługi Dolphina
 Name[ko]=Dolphin 서비스
 Name[nl]=Dolphin-services
 Name[pl]=Usługi Dolphina


@@ -44,6 +45,7 @@ Name[fr]=Services
 Name[gl]=Servizos
 Name[id]=Layanan
 Name[it]=Servizi
 Name[gl]=Servizos
 Name[id]=Layanan
 Name[it]=Servizi

+Name[ja]=サービス

 Name[ko]=서비스
 Name[nl]=Services
 Name[pl]=Usługi
 Name[ko]=서비스
 Name[nl]=Services
 Name[pl]=Usługi


@@ -69,6 +71,7 @@ Comment[fr]=Configuration des services du gestionnaire de fichiers
 Comment[gl]=Configurar servizos de xestores de ficheiros.
 Comment[id]=Konfigurasi layanan manajer berkas
 Comment[it]=Configura i servizi del gestore dei file
 Comment[gl]=Configurar servizos de xestores de ficheiros.
 Comment[id]=Konfigurasi layanan manajer berkas
 Comment[it]=Configura i servizi del gestore dei file

+Comment[ja]=ファイルマネージャのサービスを設定します

 Comment[ko]=파일 관리자 서비스 설정
 Comment[nb]=Sett opp tjenester i filbehandleren
 Comment[nl]=Bestandsbeheerderservices configureren
 Comment[ko]=파일 관리자 서비스 설정
 Comment[nb]=Sett opp tjenester i filbehandleren
 Comment[nl]=Bestandsbeheerderservices configureren

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index ac79626f85ec2ed025047767798f5598e1ac411b..85edc20ce281c888422776b324feaac6848dd64f 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -8,6 +8,7 @@ Name[fr]=Modes d'affichage de Dolphin
 Name[gl]=Modos de vista de Dolphin
 Name[id]=Mode Tampilan Dolphin
 Name[it]=Viste di Dolphin
 Name[gl]=Modos de vista de Dolphin
 Name[id]=Mode Tampilan Dolphin
 Name[it]=Viste di Dolphin

+Name[ja]=Dolphin 表示モード

 Name[ko]=Dolphin 보기 모드
 Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen
 Name[ko]=Dolphin 보기 모드
 Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen


@@ -36,6 +37,7 @@ Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin.
 Comment[gl]=Este servizo permite configurar os modos de vista de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin.
 Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
 Comment[gl]=Este servizo permite configurar os modos de vista de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin.
 Comment[it]=Questo servizio permette di configurare le viste di Dolphin.

+Comment[ja]=Dolphin の表示モードを設定します

 Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
 Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
 Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다.
 Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
 Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.


@@ -72,6 +74,7 @@ Name[fr]=Modes d'affichage
 Name[gl]=Modos de vista
 Name[id]=Mode Tampilan
 Name[it]=Viste
 Name[gl]=Modos de vista
 Name[id]=Mode Tampilan
 Name[it]=Viste

+Name[ja]=表示モード

 Name[ko]=보기 모드
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[ko]=보기 모드
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi


@@ -100,6 +103,7 @@ Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers
 Comment[gl]=Configurar os modos de vista do xestor de ficheiros.
 Comment[id]=Konfigurasi mode tampilan manajer berkas
 Comment[it]=Configura le viste del gestore dei file
 Comment[gl]=Configurar os modos de vista do xestor de ficheiros.
 Comment[id]=Konfigurasi mode tampilan manajer berkas
 Comment[it]=Configura le viste del gestore dei file

+Comment[ja]=ファイルマネージャの表示モードを設定します

 Comment[ko]=파일 관리자 보기 모드 설정
 Comment[nb]=Tilpass filbehandlerens visningsmåter
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren
 Comment[ko]=파일 관리자 보기 모드 설정
 Comment[nb]=Tilpass filbehandlerens visningsmåter
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren

diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index 85744ca1a52441f2a11875805bfa9ac52f20ea2b..4dad21925dd142125285027b3a7080b2e8304749 100644 (file)
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -11,6 +11,7 @@ Comment[fr]=Module externe pour le contrôle de version applicable aux vues de f
 Comment[gl]=Complemento de control de versión para vistas de ficheiros.
 Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas
 Comment[it]=Estensione di controllo delle versioni per le viste dei file
 Comment[gl]=Complemento de control de versión para vistas de ficheiros.
 Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas
 Comment[it]=Estensione di controllo delle versioni per le viste dei file

+Comment[ja]=ファイルビューのためのバージョン管理プラグイン

 Comment[ko]=파일 보기를 위한 버전 관리 플러그인
 Comment[nb]=Versjonskontrollmodul for filvisninger
 Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
 Comment[ko]=파일 보기를 위한 버전 관리 플러그인
 Comment[nb]=Versjonskontrollmodul for filvisninger
 Comment[nl]=Plugin voor versiecontrole op bestandoverzichten