Merge branch 'translations' into newhashmerge

2016-09-19 14:53:40 +02:00
parent 391b7690e6 63bc7e121f
commit 42f14873cd
16 changed files with 516 additions and 206 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -746,5 +746,7 @@ define([
        };
    };

+    Messages._applyTranslation();
+
    return common;
 });
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -235,7 +235,7 @@ define([
        return {
            failed: function () {
                connected = false;
-                userListElement.textContent = 'Disconnected';
+                userListElement.textContent = Messages.disconnected;
                lagElement.textContent = '';
            },
            reconnecting: function (userId) {