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 1b040416f2a2f5e68c9841d515afd9fb25453a4c..99fdbccd2f2354e962c780430164ecb875066d5c 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -13,6 +13,7 @@
         "Name[cs]": "Přesunout do nové složky",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
+        "Name[eu]": "Eraman karpeta berrira",
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[ia]": "Move a nove dossier",