From: l10n daemon script <scripty@kde.org>
Date: Mon, 28 Jul 2025 01:32:54 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/b1b743c59c48f54378abc46ff055d221b68cb433

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/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index 19648c9da..fc54ce9aa 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -16,6 +16,7 @@
         "Name[fr]": "DÃ©finir l'icÃ´ne de dossiers",
         "Name[gl]": "Definir a icona do cartafol",
         "Name[he]": "××××¨×ª ×¡×× ×ª××§×××",
+        "Name[hu]": "Mappaikon beÃ¡llÃ­tÃ¡sa",
         "Name[is]": "Velja mÃ¶pputÃ¡kn",
         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "á¡áá¥áá¦ááááá¡ á®áá¢á£ááá¡ ááá§ááááá",