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 c82fccc9dd64f590788bc899d511b88ea08f71b1..c2956ea10a5c6531c5a983da210e73e8ec1d5a2e 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -18,6 +18,7 @@
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
         "Name[eu]": "Eraman karpeta berrira",
+        "Name[fi]": "Siirrä uuteen kansioon",
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[gl]": "Mover a un novo cartafol",
         "Name[he]": "העברה לתיקייה חדשה",