From 9cf37ea66c230b95e8273aa94b40d1061f0ddada Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 11 Feb 2022 01:46:47 +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"
---
 bin/plasma-mobile.desktop.cmake                   | 2 ++
 containments/homescreen/package/metadata.desktop  | 1 +
 containments/panel/package/metadata.desktop       | 1 +
 containments/taskpanel/package/metadata.desktop   | 1 +
 look-and-feel/metadata.desktop                    | 3 +++
 plasma_phone_components.notifyrc                  | 3 +++
 quicksettings/airplanemode/metadata.desktop       | 1 +
 quicksettings/nightcolor/package/metadata.desktop | 1 +
 shell/metadata.desktop                            | 2 ++
 9 files changed, 15 insertions(+)

diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake
index f0c71090..8c58fc63 100644
--- a/bin/plasma-mobile.desktop.cmake
+++ b/bin/plasma-mobile.desktop.cmake
@@ -19,6 +19,7 @@ Name[eu]=Plasma Mugikorra
 Name[fi]=Plasma Mobile
 Name[fr]=Plasma Mobile
 Name[gl]=Plasma Mobile
+Name[hi]=प्लाज़्मा मोबाइल
 Name[hu]=Plasma Mobile
 Name[ia]=Plasma Mobile
 Name[id]=Plasma Mobile
@@ -54,6 +55,7 @@ Comment[eu]=Plasma Mugikorra KDEk egina
 Comment[fi]=KDE:n Plasma Mobile
 Comment[fr]=Plasma Mobile par KDE
 Comment[gl]=Plasma Mobile de KDE
+Comment[hi]=केडीइ द्वारा प्लाज़्मा मोबाइल
 Comment[hu]=Plasma Mobile a KDE-től
 Comment[ia]=Plasma Mobile per KDE
 Comment[id]=Plasma Mobile oleh KDE
diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop
index 350de0f5..ff7513b5 100644
--- a/containments/homescreen/package/metadata.desktop
+++ b/containments/homescreen/package/metadata.desktop
@@ -17,6 +17,7 @@ Name[eu]=Telefonoko harrerako pantaila
 Name[fi]=Phonen aloitusnäyttö
 Name[fr]=Page d'accueil du téléphone
 Name[gl]=Pantalla de inicio do teléfono
+Name[hi]=फोन होमस्क्रीन
 Name[hu]=Telefon kezdőképernyő
 Name[ia]=Schermo Initial de Phone
 Name[id]=Homescreen Ponsel
diff --git a/containments/panel/package/metadata.desktop b/containments/panel/package/metadata.desktop
index 19e29e6b..bf147090 100644
--- a/containments/panel/package/metadata.desktop
+++ b/containments/panel/package/metadata.desktop
@@ -17,6 +17,7 @@ Name[eu]=Telefonoko panela
 Name[fi]=Phonen paneeli
 Name[fr]=Tableau de bord du téléphone
 Name[gl]=Panel do teléfono
+Name[hi]=फोन पैनल
 Name[hu]=Telefon panel
 Name[ia]=Panello de telephono
 Name[id]=Panel Ponsel
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index e182fd60..f9d0761b 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -16,6 +16,7 @@ Name[eu]=Telefonoko ataza panela
 Name[fi]=Phonen tehtäväpaneeli
 Name[fr]=Tableau de bord des tâches du téléphone
 Name[gl]=Panel de tarefas do teléfono
+Name[hi]=फोन टास्क पैनल
 Name[hu]=Telefon feladatpanel
 Name[ia]=Pannello de carga de Phone
 Name[id]=Panel Task Ponsel
diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop
index 11013afd..d955dd41 100644
--- a/look-and-feel/metadata.desktop
+++ b/look-and-feel/metadata.desktop
@@ -16,6 +16,7 @@ Name[eu]=Plasma telefonoa
 Name[fi]=Plasma Phone
 Name[fr]=Plasma Phone
 Name[gl]=Plasma Phone
+Name[hi]=प्लाज़्मा फोन
 Name[hu]=Plasma Phone
 Name[ia]=Plasma Phone
 Name[id]=Ponsel Plasma
@@ -51,6 +52,7 @@ Comment[eu]=Telefono adimendunetarako Plasma langunea
 Comment[fi]=Plasma-työtila älypuhelimiin
 Comment[fr]=Espace de travail Plasma pour smartphones
 Comment[gl]=Espazo de traballo de Plasma para móbiles intelixentes.
+Comment[hi]=स्मार्टफोन के लिए प्लाज्मा कार्यक्षेत्र
 Comment[hu]=Plasma felület okostelefonokhoz
 Comment[ia]=Spatio de labor de Plasma per smartphones
 Comment[id]=Kerangka kerja Plasma untuk smartphone
@@ -86,6 +88,7 @@ Keywords[eu]=Telefonoa, langunea, itxura eta izaera
 Keywords[fi]=Puhelin, työtila, ulkoasu ja tuntuma
 Keywords[fr]=Téléphone, Espace de travail, Apparence
 Keywords[gl]=teléfono, espazo de traballo, aparencia e comportamento
+Keywords[hi]=फोन, कार्यक्षेत्र, रंगरूप और अनुभव
 Keywords[hu]=Telefon, Munkaterület, Megjelenés
 Keywords[ia]=Phone (Telephono), Spatio de labor, Apparentia
 Keywords[id]=Ponsel, Kerangkakerja, Nuansa dan Suasana
diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 5f93ad81..8e8258de 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -15,6 +15,7 @@ Name[es]=Plasma
 Name[eu]=Plasma
 Name[fi]=Plasma
 Name[fr]=Plasma
+Name[hi]=प्लाज़्मा
 Name[hu]=Plasma
 Name[ia]=Plasma
 Name[it]=Plasma
@@ -46,6 +47,7 @@ Name[es]=Capturado
 Name[eu]=Atzemanda
 Name[fi]=Kaapattu
 Name[fr]=Capturé
+Name[hi]=कैप्चर्ड
 Name[hu]=Rögzítve
 Name[ia]=Capturate
 Name[it]=Catturato
@@ -74,6 +76,7 @@ Comment[es]=Capturado
 Comment[eu]=Atzemanda
 Comment[fi]=Kaapattu
 Comment[fr]=Capturé
+Comment[hi]=कैप्चर्ड
 Comment[hu]=Rögzítve
 Comment[ia]=Capturate
 Comment[it]=Catturato
diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index f35505a5..5ed1eceb 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -13,6 +13,7 @@ Name[es]=Modo avión
 Name[eu]=Hegaldi modua
 Name[fi]=Lentokonetila
 Name[fr]=Mode Avion
+Name[hi]=विमान मोड
 Name[hu]=Repülős üzemmód
 Name[ia]=Modo aeroplano
 Name[it]=Modalità aereo
diff --git a/quicksettings/nightcolor/package/metadata.desktop b/quicksettings/nightcolor/package/metadata.desktop
index a9db4247..5df47fcf 100644
--- a/quicksettings/nightcolor/package/metadata.desktop
+++ b/quicksettings/nightcolor/package/metadata.desktop
@@ -13,6 +13,7 @@ Name[es]=Color nocturno
 Name[eu]=Gaueko kolorea
 Name[fi]=Yöväri
 Name[fr]=Couleur de nuit
+Name[hi]=रात्रि के रंग
 Name[hu]=Éjszakai színek
 Name[ia]=Color de Nocte
 Name[it]=Colore notturno
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index d9da6045..ee9e5179 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -18,6 +18,7 @@ Name[eu]=Telefonoa
 Name[fi]=Phone
 Name[fr]=Téléphone
 Name[gl]=Teléfono
+Name[hi]=फोन
 Name[hu]=Telefon
 Name[ia]=Telephono
 Name[id]=Ponsel
@@ -54,6 +55,7 @@ Comment[eu]=Telefonoetarako Plasma oskola
 Comment[fi]=Plasma-työtila puhelimiin
 Comment[fr]=Terminal Plasma pour smartphones
 Comment[gl]=Intérprete de ordes de Plasma para móbiles
+Comment[hi]=फोन के लिए प्लाज्मा शेल
 Comment[hu]=Plasma felület telefonokhoz
 Comment[ia]=Shell de Plasma per telephonos
 Comment[id]=Shell Plasma untuk ponsel