From a4fbadd0db961694cb57f75a8752e538cfe3f263 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 26 Feb 2026 01:41:19 +0000
Subject: 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/setfoldericonitemaction.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/itemactions/setfoldericonitemaction.json')

diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index 5c45705aa..4d385aec8 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -27,6 +27,7 @@
         "Name[ko]": "폴더 아이콘 설정",
         "Name[lt]": "Nustatyti aplanko piktogramą",
         "Name[lv]": "Norādīt datnes ikonu",
+        "Name[nb]": "Velg mappeikon",
         "Name[nl]": "Mappictogram instellen",
         "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ",
         "Name[pl]": "Ustaw ikonę katalogu",
-- 
cgit v1.3