From: l10n daemon script <scripty@kde.org>
Date: Sun, 7 Jul 2024 01:19:17 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7f9f164b57dd50b40374e93d66803c426a39ab33

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 730c03c81..03de58f2c 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -22,6 +22,7 @@
         "Name[ka]": "ááááá¢ááá áá®áá á¡áá¥áá¦ááááá¨á",
         "Name[lt]": "Perkelti Ä¯ naujÄ aplankÄ",
         "Name[nl]": "Naar nieuwe map verplaatsen",
+        "Name[nn]": "Flytt til ny mappe",
         "Name[pl]": "PrzenieÅ do nowego katalogu",
         "Name[pt_BR]": "Mover para pasta",
         "Name[ro]": "MutÄ Ã®n dosar nou",