dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
yflory 2021-02-09 15:30:29 +01:00
parent 16f88947ea 021c76b2c9
commit 7b6689b4f1
6 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1377,5 +1377,13 @@
"settings_cacheTitle": "Cache",
"settings_cacheButton": "Cache leeren",
"settings_cacheCheckbox": "Cache auf diesem Gerät aktivieren",
"settings_cacheHint": "CryptPad legt Teile deiner Dokumente im Speicher deines Browser ab, um den Datenverkehr und die Ladezeiten zu reduzieren. Du kannst diesen Cache deaktivieren, wenn dein Gerät nicht über viel freien Speicherplatz verfügt. Aus Sicherheitsgründen wird der Cache immer beim Ausloggen geleert. Du kannst ihn auch manuell leeren, sofern du Speicherplatz auf deinem Gerät freigeben möchtest."
"settings_cacheHint": "CryptPad legt Teile deiner Dokumente im Speicher deines Browser ab, um den Datenverkehr und die Ladezeiten zu reduzieren. Du kannst diesen Cache deaktivieren, wenn dein Gerät nicht über viel freien Speicherplatz verfügt. Aus Sicherheitsgründen wird der Cache immer beim Ausloggen geleert. Du kannst ihn auch manuell leeren, sofern du Speicherplatz auf deinem Gerät freigeben möchtest.",
"admin_cat_performance": "Performance",
"admin_performanceProfilingTitle": "Performance",
"admin_performanceProfilingHint": "Übersicht über die Gesamtzeit für die Ausführung verschiedener serverseitiger Befehle",
"redo": "Wiederholen",
"undo": "Rückgängig",
"admin_performancePercentHeading": "Anteil",
"admin_performanceTimeHeading": "Zeit (Sekunden)",
"admin_performanceKeyHeading": "Befehl"
}

20
www/common/translations/messages.json
View File

@ -1385,5 +1385,23 @@
"admin_performanceProfilingTitle": "Performance",
"admin_performanceKeyHeading": "Command",
"admin_performanceTimeHeading": "Time (seconds)",
"admin_performancePercentHeading": "Percentage"
"admin_performancePercentHeading": "Percentage",
"settings_cat_style": "Appearance",
"settings_colortheme_dark": "Dark",
"settings_colortheme_light": "Light",
"settings_colortheme_default": "System default ({0})",
"settings_colorthemeHint": "Change the overall colors of CryptPad on this device.",
"settings_colorthemeTitle": "Color theme",
"admin_getquotaTitle": "Check account storage",
"admin_getquotaHint": "Check the total size of items counted against a user or team's quota given their public key.",
"admin_getquotaButton": "Check",
"pad_settings_title": "Document Settings",
"pad_settings_info": "Default settings for this document. These will be applied when new users visit this document.",
"pad_settings_width_small": "Page mode",
"pad_settings_width_large": "Full width",
"pad_settings_outline": "Choose whether the Table of Contents should be visible or hidden by default.",
"pad_settings_comments": "Choose whether the Comments should be visible or hidden by default.",
"pad_settings_hide": "Hide",
"pad_settings_show": "Show",
"settings_colortheme_custom": "Custom"
}

2
www/pad/comments.js
View File

@ -771,7 +771,7 @@ define([
var button = h('button.btn.btn-secondary', {
style: 'top:' + y + 'px;',
title: Messages.comments_comment
}, h('i.fa.fa-comment'));
}, h('i.fa.fa-commenting'));
Env.bubble = {
node: node,
button: button

10
www/pad/inner.js
View File

@ -204,16 +204,6 @@ define([
};
var mkSettingsMenu = function(framework) {
// XXX
Messages.pad_settings_title = "Document Settings";
Messages.pad_settings_info = "Default settings for this document. These will be applied when new users visit this document.";
Messages.pad_settings_width_small = "Page mode";
Messages.pad_settings_width_large = "Full width";
Messages.pad_settings_outline = "Choose whether the Table of Contents should be visible or hidden by default.";
Messages.pad_settings_comments = "Choose whether the Comments should be visible or hidden by default.";
Messages.pad_settings_hide = "Hide";
Messages.pad_settings_show = "Show";
var getSettings = function () {
var $d = $(h('div.cp-pad-settings-dialog'));
var common = framework._.sfCommon;

1
www/poll/app-poll.less
View File

@ -180,6 +180,7 @@
}
#cp-app-poll-comments {
display: block;
color: @cryptpad_text_col;
}
}
}

9
www/settings/inner.js
View File

@ -412,15 +412,6 @@ define([
]);
}, true);
// XXX
Messages.settings_colorthemeTitle = "Color theme";
Messages.settings_colorthemeHint = "Change the overall colors of CryptPad on this machine.";
Messages.settings_colortheme_default = "Default ({0})";
Messages.settings_colortheme_light = "Light";
Messages.settings_colortheme_dark = "Dark";
Messages.settings_colortheme_custom = "Custom";
Messages.settings_cat_style = "Appearance";
makeBlock('colortheme', function (cb) {
var theme = window.cryptpadStore.store['colortheme'] || 'default';
var os = window.cryptpadStore.store['colortheme_default'] || 'light';