From b10a84c770d17e06bf3e2999e935ff4dd3a203af Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 Mar 2020 05:36:51 +0100
Subject: [PATCH] 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/dolphinpart.desktop                       | 2 +-
 src/settings/kcm/kcmdolphingeneral.desktop    | 2 +-
 src/settings/kcm/kcmdolphinnavigation.desktop | 2 +-
 src/settings/kcm/kcmdolphinservices.desktop   | 2 +-
 src/settings/kcm/kcmdolphinviewmodes.desktop  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index ca3f48c48a..13e267ad5d 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -137,7 +137,7 @@ Name[ja]=コンパクト
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts
-Name[ml]=തിങ്ങിയതായി
+Name[ml]=തിങ്ങിയത്
 Name[nb]=Kompakt
 Name[nl]=Compact
 Name[nn]=Kompakt
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index c8eb36c720..f46d5118b1 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -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
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 88c1252352..503f163d18 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -218,7 +218,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
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index ea4dd15cf3..1187733a47 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -170,7 +170,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
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 486e63ca58..16b3fd5681 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