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 3f2e4fc88535e7eb7c4ef8b808006703205aa11e..c82fccc9dd64f590788bc899d511b88ea08f71b1 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -11,6 +11,7 @@
         "Name[ca@valencia]": "Mou cap a una carpeta nova",
         "Name[ca]": "Mou a una carpeta nova",
         "Name[cs]": "Přesunout do nové složky",
+        "Name[da]": "Flyt til ny mappe",
         "Name[de]": "In neuen Ordner verschieben",
         "Name[el]": "Μετακίνηση σε Νέο Φάκελο",
         "Name[en_GB]": "Move to New Folder",