From 889a574fcdde7d378cdcec75ffc5972b39efbf55 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Dec 2015 09:19:37 +0000 Subject: 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" --- src/settings/kcm/kcmdolphingeneral.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/settings') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index e810ebff9..3801aa3d8 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -56,7 +56,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[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendrąsias nuostatas. 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. @@ -145,7 +145,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[lt]=Bendrųjų failų tvarkyklės nuostatų konfigūravimas Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[nn]=Set opp generelle innstillingar for filhandsamaren -- cgit v1.3