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/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 409a3aa21..07ac89c52 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -21,6 +21,7 @@ Name[it]=Servizi di Dolphin Name[ja]=Dolphin サービス Name[ko]=Dolphin 서비스 Name[lt]=Dolphin tarnybos +Name[ml]=ഡോള്‍ഫിന്‍ സേവനങ്ങള്‍ Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services Name[nn]=Dolphin-tenester @@ -76,6 +77,7 @@ Name[it]=Servizi Name[ja]=サービス Name[ko]=서비스 Name[lt]=Paslaugos +Name[ml]=സേവനങ്ങള്‍ Name[nb]=Tjenester Name[nl]=Services Name[nn]=Tenester @@ -119,6 +121,7 @@ Comment[it]=Configura i servizi del gestore dei file Comment[ja]=ファイルマネージャのサービスを設定します Comment[ko]=파일 관리자 서비스 설정 Comment[lt]=Konfigūruokite failų tvarkyklės tarnybas +Comment[ml]=ഫയല്‍ മാനേജർ സേവനങ്ങള്‍ ക്രമീകരിയ്ക്കുക Comment[nb]=Sett opp tjenester i filbehandleren Comment[nl]=Bestandsbeheerderservices configureren Comment[nn]=Set opp tenester i filhandsamaren @@ -163,6 +166,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