From c1a2c0f1a76dd1df7109d11a9f511b8c33d85054 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 May 2015 14:00:14 +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/kcmdolphinservices.desktop | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') 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 -- cgit v1.3.1