Merge branch 'soon' into staging

www/common/onlyoffice/inner.js

@@ -364,7 +364,6 @@ define([
             ]))
         };
 
-        Messages.oo_cantMigrate = "This sheet exceeds the maximum upload size and is too large to be migrated."; // XXX
         var onUploaded = function (ev, data, err) {
             content.saveLock = undefined;
             if (err) {

www/common/translations/messages.de.json

@@ -541,7 +541,7 @@
     "four04_pageNotFound": "Wir konnten die Seite, die du angefordert hast, nicht finden.",
     "header_logoTitle": "Zu deinem CryptDrive",
     "header_homeTitle": "Zur CryptPad-Hauptseite",
-    "help_genericMore": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a>Documentation</a> liest.",
+    "help_genericMore": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a>Dokumentation</a> liest.",
     "driveReadmeTitle": "Was ist CryptPad?",
     "edit": "Bearbeiten",
     "view": "Ansehen",

www/common/translations/messages.fr.json

@@ -1181,5 +1181,7 @@
     "admin_maintenanceButton": "Planifier maintenance",
     "admin_maintenanceHint": "Planifier une maintenance sur cette instance et avertir tous les utilisateurs. Limité à une maintenance active à la fois.",
     "admin_maintenanceTitle": "Maintenance",
-    "admin_cat_broadcast": "Annonces"
+    "admin_cat_broadcast": "Annonces",
+    "oo_cantMigrate": "Ce tableur dépasse la taille maximale de téléchargement et est trop grand pour être mis à jour.",
+    "footer_roadmap": "Feuille de route"
 }

www/common/translations/messages.json

@@ -1185,5 +1185,6 @@
     "settings_deleteWarning": "Warning: you are currently subscribed to a premium plan (paid or given by another user). Please cancel your plan before deleting your account as will not be possible without contacting support once your account is deleted.",
     "settings_deleteContinue": "Delete my account",
     "settings_deleteSubscription": "Manage my subscription",
-    "footer_roadmap": "Roadmap"
+    "footer_roadmap": "Roadmap",
+    "oo_cantMigrate": "This sheet exceeds the maximum upload size and is too large to be migrated."
 }