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

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

Browse Source
This commit is contained in:
ansuz
2017-02-24 12:06:17 +01:00
parent 252fc7a640 55fb0f03ae
commit 9ccb473b46
15 changed files with 303 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@ define(function () {
// NOTE: We want to update the 'common_connectionLost' key.
// Please do not add a new 'updated_common_connectionLostAndInfo' but change directly the value of 'common_connectionLost'
out.updated_common_connectionLostAndInfo = "<b>Server Connection Lost</b><br>You're now in read-only mode until the connection is back.";
out.common_connectionLost = out.updated_common_connectionLostAndInfo;
out.updated_0_common_connectionLost = "<b>Server Connection Lost</b><br>You're now in read-only mode until the connection is back.";
out.common_connectionLost = out.updated_0_common_connectionLost;
out.websocketError = 'Unable to connect to the websocket server...';
out.typeError = "That realtime document is not compatible with the selected application";