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"

diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index f79fc6da4eb1f5e6c8b41139acb70b441154176c..7b47b521cd2cf5ba316e593c25203c3643c8d0eb 100644 (file)
--- 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[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]": "Пересунути до нової теки",
         "Name[sl]": "Premakni v novo mapo",
         "Name[tr]": "Yeni Klasöre Taşı",
         "Name[uk]": "Пересунути до нової теки",