From 22f78c474acec7e2c4a81caa8a4a2d0025bec663 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 22 May 2019 05:14:39 +0200 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 9c29e403a..c50fa3800 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -21,6 +21,7 @@ Name[it]=Viste di Dolphin Name[ja]=Dolphin 表示モード Name[ko]=Dolphin 보기 모드 Name[lt]=Dolphin rodymo būdai +Name[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ Name[nb]=Dolphin visningsmåter Name[nl]=Dolphin-weergavemodussen Name[nn]=Dolphin-visingar @@ -65,6 +66,7 @@ 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[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു. Comment[nb]=Med denne tjenesten kan du sette opp Dolphins visningsmåter. Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren. Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingsmodusar. @@ -119,6 +121,7 @@ Name[it]=Viste Name[ja]=表示モード Name[ko]=보기 모드 Name[lt]=Rodymo būdai +Name[ml]=അവതരണ ദശകള്‍ Name[nb]=Visningsmåter Name[nl]=Weergavemodi Name[nn]=Visingsmodusar @@ -163,6 +166,7 @@ Comment[it]=Configura le viste del gestore dei file Comment[ja]=ファイルマネージャの表示モードを設定します Comment[ko]=파일 관리자 보기 모드 설정 Comment[lt]=Failų tvarkyklės rodymo būdų konfigūravimas +Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nl]=Bestandsbeheerderweergavemodussen configureren Comment[nn]=Set opp visingsmodusane i filhandsamaren @@ -208,6 +212,7 @@ X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė +X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar -- cgit v1.3