From e6dc4739c3c7373f203a27cde2e31f8de1811e3a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Oct 2019 05:14:09 +0100 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index e3330af5d..9dccea5ed 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -119,7 +119,7 @@ Comment[ia]=Configura servicios del gerente de file Comment[id]=Konfigurasikan layanan pengelola file Comment[it]=Configura i servizi del gestore dei file Comment[ja]=ファイルマネージャのサービスを設定します -Comment[ko]=파일 관리자 서비스 설정 +Comment[ko]=파일 관리자 서비스 구성 Comment[lt]=Konfigūruoti failų tvarkytuvės paslaugas Comment[ml]=ഫയല്‍ മാനേജർ സേവനങ്ങള്‍ ക്രമീകരിയ്ക്കുക Comment[nb]=Sett opp tjenester i filbehandleren -- cgit v1.3.1