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/kcmdolphinviewmodes.desktop | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') 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 -- cgit v1.3