From 02422bca8986769746001658e1b7d10940ae2b8d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 12 Jun 2024 01:20:11 +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 f79fc6da4..7b47b521c 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -22,6 +22,7 @@
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[pl]": "Przenieś do nowego katalogu",
         "Name[ro]": "Mută în dosar nou",
+        "Name[ru]": "Переместить в новую папку",
         "Name[sl]": "Premakni v novo mapo",
         "Name[tr]": "Yeni Klasöre Taşı",
         "Name[uk]": "Пересунути до нової теки",
-- 
2.47.3