Merge branch 'soon' into staging

www/common/translations/messages.fr.json

@@ -1233,5 +1233,8 @@
     "admin_cat_performance": "Performance",
     "redo": "Rétablir",
     "undo": "Annuler",
-    "addOptionalPassword": "Ajouter un mot de passe (optionnel)"
+    "addOptionalPassword": "Ajouter un mot de passe (optionnel)",
+    "fm_cantUploadHere": "Impossible d'importer un fichier ici",
+    "importError": "Impossible d'importer (mauvais format)",
+    "oo_lostEdits": "Vos récentes modifications non sauvegardées n'ont pas pu être récupérées après la synchronisation du nouveau contenu."
 }

www/common/translations/messages.json

@@ -1233,5 +1233,8 @@
     "pad_settings_hide": "Hide",
     "pad_settings_show": "Show",
     "settings_colortheme_custom": "Custom",
-    "addOptionalPassword": "Add a password (optional)"
+    "addOptionalPassword": "Add a password (optional)",
+    "importError": "Failed to import (wrong format)",
+    "fm_cantUploadHere": "Can't upload a file here",
+    "oo_lostEdits": "Unfortunately your recent unsaved edits could not be recovered after synchronising new content."
 }