From: l10n daemon script <scripty@kde.org>
Date: Wed, 10 Jan 2024 02:08:59 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7e02110c64b178f16519ee3be6a4d460e967236d

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"
---

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",