From badb279ab4dc7a498ce3a8dbe4b1f40ab592a4d0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 18 Feb 2022 01:50:38 +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"
---
 kcms/mobileshell/package/metadata.desktop        | 3 +++
 quicksettings/caffeine/metadata.desktop          | 1 +
 quicksettings/powermenu/package/metadata.desktop | 1 +
 3 files changed, 5 insertions(+)

diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop
index 008ddee1..f3528b8f 100644
--- a/kcms/mobileshell/package/metadata.desktop
+++ b/kcms/mobileshell/package/metadata.desktop
@@ -7,6 +7,7 @@ Name[az]=Örtük
 Name[ca]=Intèrpret d'ordres
 Name[es]=Intérprete de órdenes
 Name[fr]=Shell
+Name[hi]=शेल
 Name[hu]=Felület
 Name[nl]=Shell
 Name[ro]=Interpretor
@@ -19,6 +20,7 @@ Comment[az]=Sistem
 Comment[ca]=Configura l'intèrpret d'ordres del sistema
 Comment[es]=Configura el intérprete de órdenes del sistema
 Comment[fr]=Configurer le shell du système
+Comment[hi]=तंत्र शेल विन्यस्त करें
 Comment[hu]=A rendszerfelület beállítása
 Comment[nl]=De systeem-shell configureren
 Comment[ro]=Configurează interpretorul sistemului
@@ -47,6 +49,7 @@ X-KDE-Keywords[az]=sistem,örtük,panel
 X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó
 X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel
 X-KDE-Keywords[fr]=système, shell, panneau
+X-KDE-Keywords[hi]=तंत्र,शैल,पैनल
 X-KDE-Keywords[hu]=rendszer,felület,panel
 X-KDE-Keywords[nl]=systeem,shell,paneel
 X-KDE-Keywords[ro]=sistem,interpretor,panou
diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop
index 1e4e3fbb..7b20a4f0 100644
--- a/quicksettings/caffeine/metadata.desktop
+++ b/quicksettings/caffeine/metadata.desktop
@@ -7,6 +7,7 @@ Name[az]=Caffeine
 Name[ca]=Caffeine
 Name[es]=Cafeína
 Name[fr]=Caffeine
+Name[hi]=कैफीन
 Name[hu]=Caffeine
 Name[nl]=Cafeïne
 Name[ro]=Cafeină
diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop
index 22959d91..471c2b6e 100644
--- a/quicksettings/powermenu/package/metadata.desktop
+++ b/quicksettings/powermenu/package/metadata.desktop
@@ -7,6 +7,7 @@ Name[az]=Güc menyusu
 Name[ca]=Power Menu
 Name[es]=Menú de energía
 Name[fr]=Menu « Énergie »
+Name[hi]=शक्ती मेन्यू
 Name[hu]=Energia menü
 Name[nl]=Energiemenu
 Name[ro]=Meniu avansat