From 7e02110c64b178f16519ee3be6a4d460e967236d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 10 Jan 2024 02:08:59 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index cc24b6d88..5c15b5a71 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -21,6 +21,7 @@
         "Name[gl]": "Xeral",
         "Name[he]": "כללי",
         "Name[hi]": "साधारण",
+        "Name[hu]": "Általános",
         "Name[ia]": "General",
         "Name[id]": "Umum",
         "Name[ie]": "General",
-- 
2.47.3