From fda04df4925298ba85bd8285533c2262d84e1e94 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 8 Jul 2021 01:21:09 +0000
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"
---
 dataengines/hotplug/plasma-dataengine-hotplug.desktop | 2 +-
 kcms/notifications/kcm_notifications.desktop          | 2 +-
 kcms/notifications/package/metadata.desktop           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dataengines/hotplug/plasma-dataengine-hotplug.desktop b/dataengines/hotplug/plasma-dataengine-hotplug.desktop
index 665e292a3..07cd57b9b 100644
--- a/dataengines/hotplug/plasma-dataengine-hotplug.desktop
+++ b/dataengines/hotplug/plasma-dataengine-hotplug.desktop
@@ -24,7 +24,7 @@ Name[ga]=Imeachtaí Hotplug
 Name[gl]=Eventos de Hotplug
 Name[gu]=હોટપ્લગ ઇવેન્ટ્સ
 Name[he]=אירועי חיבור התקנים נשלפים
-Name[hi]=हाटप्लग घटनाएँ
+Name[hi]=हाटप्लग कार्यक्रम
 Name[hne]=हाटप्लग घटना
 Name[hr]=Događaji brzog uštekavanja
 Name[hu]=Eszközcsatolást kezelő plazmoid
diff --git a/kcms/notifications/kcm_notifications.desktop b/kcms/notifications/kcm_notifications.desktop
index 6bf065c39..463ffacb6 100644
--- a/kcms/notifications/kcm_notifications.desktop
+++ b/kcms/notifications/kcm_notifications.desktop
@@ -108,7 +108,7 @@ Comment[en_GB]=Event Notifications and Actions
 Comment[es]=Notificaciones y acciones de eventos
 Comment[fi]=Tapahtumailmoitukset ja -toiminnot
 Comment[fr]=Notifications d'évènements et d'actions
-Comment[hi]=घटना सूचनाएं और कार्रवाइयां
+Comment[hi]=कार्यक्रम सूचनाएं और कार्रवाइयां
 Comment[hu]=Eseményértesítések és műveletek
 Comment[ia]=Notificationes de evento e Actiones
 Comment[it]=Notifiche degli eventi e azioni
diff --git a/kcms/notifications/package/metadata.desktop b/kcms/notifications/package/metadata.desktop
index f4b6cb8ed..f7a3f644a 100644
--- a/kcms/notifications/package/metadata.desktop
+++ b/kcms/notifications/package/metadata.desktop
@@ -97,7 +97,7 @@ Comment[en_GB]=Event Notifications and Actions
 Comment[es]=Notificaciones y acciones de eventos
 Comment[fi]=Tapahtumailmoitukset ja -toiminnot
 Comment[fr]=Notifications d'évènements et d'actions
-Comment[hi]=घटना सूचनाएं और कार्रवाइयां
+Comment[hi]=कार्यक्रम सूचनाएं और कार्रवाइयां
 Comment[hu]=Eseményértesítések és műveletek
 Comment[ia]=Notificationes de evento e Actiones
 Comment[it]=Notifiche degli eventi e azioni