From: l10n daemon script <scripty@kde.org>
Date: Thu, 6 Feb 2020 04:34:55 +0000 (+0100)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2c29c7ed28f7389ec79907760311fce3a26622c2

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"
---

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index d3f19539a..c8eb36c72 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -22,7 +22,7 @@ Name[ja]=Dolphin 全般
 Name[ko]=Dolphin 일반
 Name[lt]=Dolphin bendrosios
 Name[lv]=Dolphin vispārējs
-Name[ml]=പൊതു സജ്ജീകരണങ്ങള്‍
+Name[ml]=ഡോൾഫിൻ ജനറൽ
 Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen
 Name[nn]=Generelt for Dolphin
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 76e561d9d..486e63ca5 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -124,7 +124,7 @@ Name[ja]=表示モード
 Name[ko]=보기 모드
 Name[lt]=Rodinio veiksenos
 Name[lv]=Skata režīmi
-Name[ml]=അവതരണ ദശകള്‍
+Name[ml]=അവതരണ രീതികള്‍
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[nn]=Visingsmodusar
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index a04f1cc60..c3d4d1837 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -25,7 +25,7 @@ Comment[ja]=ファイルビューのためのバージョン管理プラグイ
 Comment[ko]=파일 보기용 버전 제어 플러그인
 Comment[lt]=Failo rodinių versijų tvarkymo papildinys
 Comment[lv]=Versiju kontroles spraudnis priekš datņu skata
-Comment[ml]=ഫയല്‍ അവതരണദിശകൾക്കുള്ള പതിപ്പ് നിയന്ത്രണ സംയോജകം
+Comment[ml]=ഫയൽ കാഴ്‌ചകൾക്കായുള്ള പതിപ്പ് നിയന്ത്രണ പ്ലഗിൻ
 Comment[nb]=Versjonskontrollmodul for filvisninger
 Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
 Comment[nn]=Versjonskontroll-tillegg for filvisingar