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"

4 files changed, 19 insertions, 0 deletions

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 8699d8b21..35ace3630 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -10,6 +10,7 @@ Name[id]=Dolphin Umum
 Name[it]=Impostazioni generali di Dolphin
 Name[ja]=Dolphin 全般
 Name[ko]=Dolphin 일반
+Name[lt]=Dolphin bendrieji
 Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen
 Name[nn]=Generelt for Dolphin
@@ -39,6 +40,7 @@ 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[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus.
 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.
@@ -77,6 +79,7 @@ Name[id]=Umum
 Name[it]=Generale
 Name[ja]=全般
 Name[ko]=일반
+Name[lt]=Bendra
 Name[nb]=Generelt
 Name[nl]=Algemeen
 Name[nn]=Generelt
@@ -105,6 +108,7 @@ Comment[id]=Konfigurasi pengaturan manajer berkas umum
 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[nl]=Algemene bestandsbeheerderinstellingen configureren
 Comment[pl]=Ustawienia ogólne zarządzania plikami
 Comment[pt]=Configurar as definições gerais do gestor de ficheiros
@@ -130,6 +134,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[ko]=파일 관리자
+X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 425375800..3536ed494 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -10,6 +10,7 @@ Name[id]=Navigasi Dolphin
 Name[it]=Navigazione di Dolphin
 Name[ja]=Dolphin ナビゲーション
 Name[ko]=Dolphin 탐색
+Name[lt]=Dolphin navigacija
 Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie
 Name[nn]=Navigasjon i Dolphin
@@ -39,6 +40,7 @@ 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[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją.
 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.
@@ -76,6 +78,7 @@ Name[id]=Navigasi
 Name[it]=Navigazione
 Name[ja]=ナビゲーション
 Name[ko]=탐색
+Name[lt]=Navigacija
 Name[nb]=Navigasjon
 Name[nl]=Navigatie
 Name[nn]=Navigasjon
@@ -105,6 +108,7 @@ Comment[id]=Konfigurasi navigasi manajer berkas
 Comment[it]=Configura la navigazione col gestore dei file
 Comment[ja]=ファイルマネージャでのナビゲーションを設定します
 Comment[ko]=파일 관리자 탐색 설정
+Comment[lt]=Konfigūruokite failų tvarkyklės navigaciją
 Comment[nb]=Sett opp navigasjon i filbehandleren
 Comment[nl]=Bestandsbeheerdernavigatie configureren
 Comment[nn]=Set opp navigasjonen i filhandsamaren
@@ -133,6 +137,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[ko]=파일 관리자
+X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index f130b37ae..771ea0b41 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -10,6 +10,7 @@ Name[id]=Layanan Dolphin
 Name[it]=Servizi di Dolphin
 Name[ja]=Dolphin サービス
 Name[ko]=Dolphin 서비스
+Name[lt]=Dolphin tarnybos
 Name[nl]=Dolphin-services
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
@@ -47,6 +48,7 @@ Name[id]=Layanan
 Name[it]=Servizi
 Name[ja]=サービス
 Name[ko]=서비스
+Name[lt]=Paslaugos
 Name[nl]=Services
 Name[pl]=Usługi
 Name[pt]=Serviços
@@ -73,6 +75,7 @@ Comment[id]=Konfigurasi layanan manajer berkas
 Comment[it]=Configura i servizi del gestore dei file
 Comment[ja]=ファイルマネージャのサービスを設定します
 Comment[ko]=파일 관리자 서비스 설정
+Comment[lt]=Konfigūruokite failų tvarkyklės tarnybas
 Comment[nb]=Sett opp tjenester i filbehandleren
 Comment[nl]=Bestandsbeheerderservices configureren
 Comment[nn]=Set opp tenester i filhandsamaren
@@ -100,6 +103,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[ko]=파일 관리자
+X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 85edc20ce..8b1bce0eb 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -10,6 +10,7 @@ Name[id]=Mode Tampilan Dolphin
 Name[it]=Viste di Dolphin
 Name[ja]=Dolphin 表示モード
 Name[ko]=Dolphin 보기 모드
+Name[lt]=Dolphin rodymo būdai
 Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen
 Name[nn]=Dolphin-visingar
@@ -39,6 +40,7 @@ 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[lt]=Ši tarnyba leidžia konfigūruoti Dolphin rodymo būdus.
 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.
@@ -76,6 +78,7 @@ Name[id]=Mode Tampilan
 Name[it]=Viste
 Name[ja]=表示モード
 Name[ko]=보기 모드
+Name[lt]=Rodymo būdai
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[nn]=Visingsmodusar
@@ -105,6 +108,7 @@ Comment[id]=Konfigurasi mode tampilan manajer berkas
 Comment[it]=Configura le viste del gestore dei file
 Comment[ja]=ファイルマネージャの表示モードを設定します
 Comment[ko]=파일 관리자 보기 모드 설정
+Comment[lt]=Failų tvarkyklės rodymo būdų konfigūravimas
 Comment[nb]=Tilpass filbehandlerens visningsmåter
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren
 Comment[nn]=Set opp visingsmodusane i filhandsamaren
@@ -133,6 +137,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[ko]=파일 관리자
+X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar