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 ce4a9d4e184f5a29bfc785bba9a50fffecda27e3..bb8bb48e9acf1ea4e871a9b873a8b5d47871b05c 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -19,6 +19,7 @@
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[hu]": "Áthelyezés új mappába",
         "Name[ia]": "Move a nove dossier",
+        "Name[ie]": "Mover a un nov fólder",
         "Name[is]": "Færa í nýja möppu",
         "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",