From af7e37139d32e562308975a46f28cab0e40965df Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 22 Jun 2024 01:22:28 +0000 Subject: [PATCH] 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(+) diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index f493b6521d..3d140705e6 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -22,6 +22,7 @@ "Name[lt]": "Perkelti į naują aplanką", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[pl]": "Przenieś do nowego katalogu", + "Name[pt_BR]": "Mover para pasta", "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", "Name[sl]": "Premakni v novo mapo",