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 7cdb60c8b03977260f11266375cacc7a20b36607..7c8f43289464a3544d8d14f0873b1e74be9527ef 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -24,6 +24,7 @@
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[nn]": "Flytt til ny mappe",
+        "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ",
         "Name[pl]": "Przenieś do nowego katalogu",
         "Name[pt_BR]": "Mover para pasta",
         "Name[ro]": "Mută în dosar nou",