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 7c8f43289464a3544d8d14f0873b1e74be9527ef..ce4a9d4e184f5a29bfc785bba9a50fffecda27e3 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -17,6 +17,7 @@
         "Name[eu]": "Eraman karpeta berrira",
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
+        "Name[hu]": "Áthelyezés új mappába",
         "Name[ia]": "Move a nove dossier",
         "Name[is]": "Færa í nýja möppu",
         "Name[it]": "Sposta in una nuova cartella",