From d8461fc02ed4eac062840f0dbd3eee9fe3047101 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Feb 2026 01:41:25 +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 0b1b67551..efef02af9 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -38,6 +38,7 @@ "Name[nn]": "Flytt til ny mappe", "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ", "Name[pl]": "Przenieś do nowego katalogu", + "Name[pt]": "Mover para nova pasta", "Name[pt_BR]": "Mover para nova pasta", "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", -- cgit v1.3