From 98ff038416c5fc539d5cce0fbcae47b5e878cd58 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Jul 2024 01:20:28 +0000
Subject: [PATCH] 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"
---
 src/itemactions/movetonewfolderitemaction.json | 1 +
 1 file changed, 1 insertion(+)

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ą",
-- 
2.47.3