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 e0c0978e3d47e3e5567b61d5d9d3b258a42c8f6b..2c516d0bc2d19e268e2695e3c386421479596162 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -9,12 +9,14 @@
         "Name[bg]": "Преместване в нова папка",
         "Name[ca@valencia]": "Mou cap a una carpeta nova",
         "Name[ca]": "Mou a una carpeta nova",
+        "Name[cs]": "Přesunout do nové složky",
         "Name[en_GB]": "Move to New Folder",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[ia]": "Move a nove dossier",
+        "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",