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 99fdbccd2f2354e962c780430164ecb875066d5c..730c03c816fc7c4b6fdfce5502ef4ff498f7c0ff 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -17,6 +17,7 @@
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[ia]": "Move a nove dossier",
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[ia]": "Move a nove dossier",

+        "Name[is]": "Færa í nýja möppu",

         "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[lt]": "Perkelti į naują aplanką",