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 bb8bb48e9acf1ea4e871a9b873a8b5d47871b05c..2dd9eb815402d42b527197035e183469fd0abc3e 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -16,6 +16,7 @@
         "Name[es]": "Mover a una nueva carpeta",
         "Name[eu]": "Eraman karpeta berrira",
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[es]": "Mover a una nueva carpeta",
         "Name[eu]": "Eraman karpeta berrira",
         "Name[fr]": "Déplacer vers le nouveau dossier",

+        "Name[gl]": "Mover a un novo cartafol",

         "Name[he]": "העברה לתיקייה חדשה",
         "Name[hu]": "Áthelyezés új mappába",
         "Name[ia]": "Move a nove dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[hu]": "Áthelyezés új mappába",
         "Name[ia]": "Move a nove dossier",