From 5d2b495c44746d37f5e281f46ac7ab6cd9702cc7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 11 Jun 2024 01:19:51 +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 2c516d0bc2..f79fc6da4e 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -21,6 +21,7 @@ "Name[lt]": "Perkelti į naują aplanką", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[pl]": "Przenieś do nowego katalogu", + "Name[ro]": "Mută în dosar nou", "Name[sl]": "Premakni v novo mapo", "Name[tr]": "Yeni Klasöre Taşı", "Name[uk]": "Пересунути до нової теки",