web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
yflory
2018-07-19 11:43:06 +02:00
parent ae17427e00 6922bc1e08
commit 1e092f36ba
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/translations/messages.js
View File

@@ -617,6 +617,7 @@ define(function () {
out.settings_changePasswordNewConfirm = "Confirm new password";
out.settings_changePasswordConfirm = "Are you sure you want to change your password? You will need to log back in on all your devices.";
out.settings_changePasswordError = "An unexpected error occurred. If you are unable to login or change your password, contact your CryptPad administrators.";
out.settings_changePasswordPending = "Your password is being updated. Please do not close or reload this page until the process has completed.";
out.upload_title = "File upload";
out.upload_modal_title = "File upload options";