From cb9142a9bbabe0d4adc65253ede01bc998cf0edb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 9 Aug 2021 01:11:30 +0000
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/org.kde.dolphin.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 63509b476..9489ab370 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -17,6 +17,7 @@ Name[fi]=Dolphin
 Name[fr]=Dolphin
 Name[gl]=Dolphin
 Name[he]=Dolphin
+Name[hi]=डॉल्फ़िन
 Name[hu]=Dolphin
 Name[ia]=Dolphin
 Name[id]=Dolphin
@@ -73,6 +74,7 @@ GenericName[fi]=Tiedostonhallinta
 GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
 GenericName[he]=מנהל קבצים
+GenericName[hi]=फ़ाइल प्रबंधक
 GenericName[hu]=Fájlkezelő
 GenericName[ia]=Gerente de file
 GenericName[id]=Pengelola File
-- 
cgit v1.3