From a4fbadd0db961694cb57f75a8752e538cfe3f263 Mon Sep 17 00:00:00 2001 From: l10n daemon script 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/movetonewfolderitemaction.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/itemactions/movetonewfolderitemaction.json') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index efef02af9..6c27e343e 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -34,6 +34,7 @@ "Name[ko]": "새 폴더로 이동", "Name[lt]": "Perkelti į naują aplanką", "Name[lv]": "Pārvietot uz jaunu mapi", + "Name[nb]": "Flytt til ny mappe", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[nn]": "Flytt til ny mappe", "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ", -- cgit v1.3