From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Jul 2024 01:20:28 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/98ff038416c5fc539d5cce0fbcae47b5e878cd58?ds=inline

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/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index 99fdbccd2..730c03c81 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -17,6 +17,7 @@
         "Name[fr]": "DÃ©placer vers le nouveau dossier",
         "Name[he]": "××¢××¨× ××ª××§××× ×××©×",
         "Name[ia]": "Move a nove dossier",
+        "Name[is]": "FÃ¦ra Ã­ nÃ½ja mÃ¶ppu",
         "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "ááááá¢ááá áá®áá á¡áá¥áá¦ááááá¨á",
         "Name[lt]": "Perkelti Ä¯ naujÄ aplankÄ",