From 6adbb73b992c6196e4c46023aafcf245574702e7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 2 Mar 2023 02:25:05 +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"
---
 src/settings/kcm/kcmdolphingeneral.json    | 2 ++
 src/settings/kcm/kcmdolphinnavigation.json | 1 +
 src/settings/kcm/kcmdolphinviewmodes.json  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 81b52a32c..cd93d374b 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -17,6 +17,7 @@
         "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak",
         "Description[fi]": "Tiedostonhallinnan yleisasetukset",
         "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
+        "Description[hi]": "साधारण फ़ाइल प्रबंधक सेटिंग्स विन्यस्त करें",
         "Description[ia]": "Configura preferentias del gerente general de file",
         "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
         "Description[ie]": "Configurar li parametres del gerente de files",
@@ -61,6 +62,7 @@
         "Name[eu]": "Orokorra",
         "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
+        "Name[hi]": "साधारण",
         "Name[ia]": "General",
         "Name[id]": "Umum",
         "Name[ie]": "General",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 68a7b2905..9999e6f85 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -17,6 +17,7 @@
         "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea",
         "Description[fi]": "Tiedostonhallinnan selausasetukset",
         "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
+        "Description[hi]": "फ़ाइल प्रबंधक संचालन विन्यस्त करें",
         "Description[ia]": "Configura navigation del gerente de file",
         "Description[id]": "Konfigurasikan navigasi pengelola file",
         "Description[ie]": "Configurar li navigation del gerente de files",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3127f6dcd..10a1613b9 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -17,6 +17,7 @@
         "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak",
         "Description[fi]": "Tiedostonhallinnan näkymäasetukset",
         "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
+        "Description[hi]": "फ़ाइल प्रबंधक दृश्य मोड विन्यस्त करें",
         "Description[ia]": "Configura le modos de vista del gerente de file",
         "Description[id]": "Konfigurasikan mode tampilan pengelola file",
         "Description[ie]": "Configurar li modes de vise del gerente de files",
-- 
2.47.3