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 ca0b1f3cfd99180761bc2f099901abca45d1aaa0..e0c0978e3d47e3e5567b61d5d9d3b258a42c8f6b 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -6,20 +6,25 @@
         ],
         "Name": "Move to New Folder",
         "Name[ar]": "انقل إلى مجلد جديد",
+        "Name[bg]": "Преместване в нова папка",
         "Name[ca@valencia]": "Mou cap a una carpeta nova",
         "Name[ca]": "Mou a una carpeta nova",
         "Name[en_GB]": "Move to New Folder",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
+        "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[ia]": "Move a nove dossier",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",
+        "Name[pl]": "Przenieś do nowego katalogu",
         "Name[sl]": "Premakni v novo mapo",
         "Name[tr]": "Yeni Klasöre Taşı",
         "Name[uk]": "Пересунути до нової теки",
         "Name[x-test]": "xxMove to New Folderxx",
+        "Name[zh_CN]": "移动到新建文件夹",
+        "Name[zh_TW]": "移動到新資料夾",
         "ServiceTypes": [
             "KFileItemAction/Plugin"
         ]