From b10a84c770d17e06bf3e2999e935ff4dd3a203af Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Mar 2020 05:36:51 +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/kcmdolphinviewmodes.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 486e63ca5..16b3fd568 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -170,7 +170,7 @@ Comment[ja]=ファイルマネージャの表示モードを設定します Comment[ko]=파일 관리자 보기 모드 구성 Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas Comment[lv]=Konfigurēt datņu pārvaldnieka skata režīmus -Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക +Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ രീതികള്‍ ക്രമീകരിയ്ക്കുക Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nl]=Bestandsbeheerderweergavemodussen configureren Comment[nn]=Set opp visingsmodusane i filhandsamaren @@ -217,7 +217,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lv]=datņu pārvaldnieks -X-KDE-Keywords[ml]=ഫയൽ മാനേജർ +X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar -- cgit v1.3