Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/admin/inner.js

@@ -120,7 +120,8 @@ define([
     Messages.admin_archiveInput = "Document URL";
     Messages.admin_archiveInput2 = "Document password";
     Messages.admin_archiveInval = "Invalid document";
-    Messages.restoredFromServer = "Pad restored";
+    Messages.restoredFromServer = "Document restored";
+    Messages.archivedFromServer = "Document archived";
 
     var archiveForm = function (archive, $div, $button) {
         var label = h('label', { for: 'cp-admin-archive' }, Messages.admin_archiveInput);
@@ -221,7 +222,7 @@ define([
                         console.error(e);
                         return;
                     }
-                    UI.log(archive ? Messages.deletedFromServer : Messages.restoredFromServer);
+                    UI.log(archive ? Messages.archivedFromServer : Messages.restoredFromServer);
                     $input.val('');
                     $pwInput.val('');
                 });

www/common/inner/properties.js

@@ -12,8 +12,6 @@ define([
              Messages, nThen) {
     var Properties = {};
 
-    Messages.documentID = Messages.documentID || 'Document identifier'; // XXX
-
     var getPadProperties = function (Env, data, opts, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
         var common = Env.common;

www/common/translations/messages.de.json

@@ -1468,5 +1468,6 @@
     "loading_state_1": "Drive laden",
     "loading_state_0": "Oberfläche vorbereiten",
     "loading_state_5": "Dokument rekonstruieren",
-    "error_unhelpfulScriptError": "Skriptfehler: Siehe Konsole im Browser für Details"
+    "error_unhelpfulScriptError": "Skriptfehler: Siehe Konsole im Browser für Details",
+    "documentID": "Kennung des Dokuments"
 }