From 22f78c474acec7e2c4a81caa8a4a2d0025bec663 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
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/kcmdolphinnavigation.desktop | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/settings/kcm/kcmdolphinnavigation.desktop')

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index ecc2e46d9..f6686fbc8 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -21,6 +21,7 @@ Name[it]=Navigazione di Dolphin
 Name[ja]=Dolphin ナビゲーション
 Name[ko]=Dolphin 탐색
 Name[lt]=Dolphin navigacija
+Name[ml]=ഡോള്‍ഫിന്‍ നാവിഗേഷന്‍
 Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie
 Name[nn]=Navigasjon i Dolphin
@@ -65,6 +66,7 @@ Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.
 Comment[ja]=Dolphin でのナビゲーションを設定します
 Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다.
 Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją.
+Comment[ml]=ഡോള്‍ഫിന്‍ നാവിഗേഷൻ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു.
 Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin.
 Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
 Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin.
@@ -120,6 +122,7 @@ Name[it]=Navigazione
 Name[ja]=ナビゲーション
 Name[ko]=탐색
 Name[lt]=Navigacija
+Name[ml]=നാവിഗേഷന്‍
 Name[nb]=Navigasjon
 Name[nl]=Navigatie
 Name[nn]=Navigasjon
@@ -164,6 +167,7 @@ Comment[it]=Configura la navigazione col gestore dei file
 Comment[ja]=ファイルマネージャでのナビゲーションを設定します
 Comment[ko]=파일 관리자 탐색 설정
 Comment[lt]=Konfigūruokite failų tvarkyklės navigaciją
+Comment[ml]=ഫയല്‍ മാനേജർ നാവിഗേഷൻ ക്രമീകരിയ്ക്കുക
 Comment[nb]=Sett opp navigasjon i filbehandleren
 Comment[nl]=Bestandsbeheerdernavigatie configureren
 Comment[nn]=Set opp navigasjonen i filhandsamaren
@@ -209,6 +213,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