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 d85984cf2d4aa9417671420711ba6f5bf6304043..bf31f673975f4afe3fc4d03f9e26ebd9bec1be55 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[de]": "In neuen Ordner verschieben",
         "Name[el]": "Μετακίνηση σε Νέο Φάκελο",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",