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 7b47b521cd2cf5ba316e593c25203c3643c8d0eb..f493b6521db06c0960099f4164a8922246e42f1d 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -6,6 +6,7 @@
         ],
         "Name": "Move to New Folder",
         "Name[ar]": "انقل إلى مجلد جديد",
+        "Name[be]": "Перамясціць у новы каталог",
         "Name[bg]": "Преместване в нова папка",
         "Name[ca@valencia]": "Mou cap a una carpeta nova",
         "Name[ca]": "Mou a una carpeta nova",
@@ -24,6 +25,8 @@
         "Name[ro]": "Mută în dosar nou",
         "Name[ru]": "Переместить в новую папку",
         "Name[sl]": "Premakni v novo mapo",
+        "Name[sv]": "Flytta till ny katalog",
+        "Name[ta]": "புதிய அடைவிற்கு நகர்த்து",
         "Name[tr]": "Yeni Klasöre Taşı",
         "Name[uk]": "Пересунути до нової теки",
         "Name[x-test]": "xxMove to New Folderxx",