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 730c03c816fc7c4b6fdfce5502ef4ff498f7c0ff..03de58f2c633b42fe20f60e4d1050d841b15f76d 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -22,6 +22,7 @@
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",
+        "Name[nn]": "Flytt til ny mappe",
         "Name[pl]": "Przenieś do nowego katalogu",
         "Name[pt_BR]": "Mover para pasta",
         "Name[ro]": "Mută în dosar nou",