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"
2024-07-04 17:30:55 +00:00 · 2024-01-10 02:08:59 +00:00 · 2024-01-10 02:08:59 +00:00 · 7e02110c64
commit 7e02110c64
parent b625a44a69
1 changed files with 1 additions and 0 deletions
--- 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",