From a0da7b7f4169712a5e29c15f8ccd05328750a5c8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 27 Aug 2020 06:07:22 +0200
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"
---
 org.kde.alligator.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.kde.alligator.desktop b/org.kde.alligator.desktop
index c54ba3f2..bcf3a9ff 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -7,6 +7,7 @@ Name[es]=Alligator
 Name[et]=Alligator
 Name[eu]=Alligator
 Name[fr]=Alligator
+Name[hi]=एल्लिगेटर (Alligator)
 Name[it]=Alligator
 Name[ko]=Alligator
 Name[nl]=Alligator
@@ -26,6 +27,7 @@ Comment[cs]=Mobilní čtečka kanálů
 Comment[et]=Mobiili uudistelugeja
 Comment[eu]=Mugikorrerako web-jario irakurlea
 Comment[fr]=Lecteur nomade de fils d'actualité
+Comment[hi]=मोबाइल फ़ीड रीडर
 Comment[it]=Lettore di fonti mobile
 Comment[ko]=모바일 피드 리더
 Comment[nl]=Mobiele feedlezer
@@ -44,6 +46,7 @@ GenericName[cs]=Čtečka kanálů
 GenericName[et]=Uudistelugeja
 GenericName[eu]=Web-jario irakurlea
 GenericName[fr]=Lecteur de fils d'actualité
+GenericName[hi]=फ़ीड रीडर
 GenericName[it]=Lettore di fonti
 GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer