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 bf31f673975f4afe3fc4d03f9e26ebd9bec1be55..3f8efeddc18e3226d78c64f99d5af64c6c95c25e 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -27,6 +27,7 @@
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[ko]": "새 폴더로 이동",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[ko]": "새 폴더로 이동",
         "Name[lt]": "Perkelti į naują aplanką",

+        "Name[lv]": "Pārvietot uz jaunu mapi",

         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[nn]": "Flytt til ny mappe",
         "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[nn]": "Flytt til ny mappe",
         "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ",