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

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 814ae8c9b..5d02aeb06 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -15,6 +15,7 @@
         "Name[fr]": "DÃ©finir l'icÃ´ne de dossiers",
         "Name[gl]": "Definir a icona do cartafol",
         "Name[he]": "××××¨×ª ×¡×× ×ª××§×××",
+        "Name[is]": "Velja mÃ¶pputÃ¡kn",
         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "á¡áá¥áá¦ááááá¡ á®áá¢á£ááá¡ ááá§ááááá",
         "Name[ko]": "í´ë ìì´ì½ ì¤ì ",