infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
yflory 2020-12-04 11:15:52 +01:00
parent 5f67038dad aa6fe435fb
commit 5b734ce48d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/admin/inner.js
View File

@ -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('');
});

2
www/common/inner/properties.js
View File

@ -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;

3
www/common/translations/messages.de.json
View File

@ -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"
}