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 f493b6521db06c0960099f4164a8922246e42f1d..3d140705e6dee98bfae3dc0f77b7ad7cfb796863 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -22,6 +22,7 @@
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[pl]": "Przenieś do nowego katalogu",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[pl]": "Przenieś do nowego katalogu",

+        "Name[pt_BR]": "Mover para pasta",

         "Name[ro]": "Mută în dosar nou",
         "Name[ru]": "Переместить в новую папку",
         "Name[sl]": "Premakni v novo mapo",
         "Name[ro]": "Mută în dosar nou",
         "Name[ru]": "Переместить в новую папку",
         "Name[sl]": "Premakni v novo mapo",