From 391c55f0a86a151b9f45d7a65f92db713bcc7013 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Aug 2025 01:36:52 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/itemactions') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index ce394007d..aa6251d6c 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -36,7 +36,7 @@ "Name[nn]": "Flytt til ny mappe", "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ", "Name[pl]": "Przenieś do nowego katalogu", - "Name[pt_BR]": "Mover para pasta", + "Name[pt_BR]": "Mover para nova pasta", "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", "Name[sa]": "New Folder इत्यत्र गच्छन्तु", -- cgit v1.3