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 cc24b6d8886c50d4a6a26a78477d8a94e21e1d31..5c15b5a71871c9a4c7582841c33cb40ccf9baf46 100644 (file)
--- 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",