Merge branch 'master' into master

2017-07-22 09:18:12 -03:00 · 2017-07-22 09:18:12 -03:00 · 6785f166fd
parent 6af4335ead a79d9d3e66
commit 6785f166fd
387 changed files with 120217 additions and 15094 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,5 @@
+data
+Dockerfile
+docker-compose.yml
+.git
+.gitignore
--- a/.env
+++ b/.env
@ -0,0 +1,4 @@
+VERSION=latest
+USE_SSL=true
+STORAGE='./storage/file'
+LOG_TO_STDOUT=true
--- a/.flowconfig
+++ b/.flowconfig
@ -0,0 +1,7 @@
+[ignore]
+
+[include]
+
+[libs]
+
+[options]
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,10 @@ customization
 /customize/
 messages.log
 .DS_Store
+www/scratch
+data
+npm-debug.log
+pins/
+blob/
+blobstage/
+privileged.conf
--- a/.jshintignore
+++ b/.jshintignore
@ -1,11 +1,10 @@
 node_modules/
 www/bower_components/
-www/code/codemirror*
-www/common/chainpad.js
-storage/kad.js
-www/common/otaml.js
+www/common/pdfjs/

-NetFluxWebsocketSrv.js
-NetFluxWebsocketServer.js
-WebRTCSrv.js
+server.js
+www/common/media-tag.js
+www/scratch

+www/common/toolbar.js
+www/common/hyperscript.js
--- a/.jshintrc
+++ b/.jshintrc
@ -10,7 +10,7 @@
    "notypeof": true,
    "shadow": false,
    "undef": true,
-    "unused": false,
+    "unused": true,
    "futurehostile":true,
    "browser": true,
    "predef": [
--- a/.travis.yml
+++ b/.travis.yml
@ -1,19 +1,22 @@
 language: node_js
 env:
  matrix:
-    - "BROWSER='firefox:19:Windows 2012'"
-    - "BROWSER='chrome::Windows 2008'"
+    - "BROWSER='firefox::Windows 10'"
+    - "BROWSER='chrome::Windows 10'"
+    #- "BROWSER='MicrosoftEdge:14.14393:Windows 10'"
+    #- "BROWSER='internet explorer:11.103:Windows 10'"
+    #- "BROWSER='safari:10.0:macOS 10.12'"
+    #- "BROWSER='safari:9.0:OS X 10.11'"
 branches:
  only:
    - master
-    - diffdom
-    - beta
-    - netflux
+    - soon
+    - staging
 node_js:
-  - "4.2.1"
+  - "6.6.0"
 before_script:
  - npm run-script lint
-  - cp config.js.dist config.js
+  - cp config.example.js config.js
  - npm install bower
  - ./node_modules/bower/bin/bower install
  - node ./server.js &
--- a/20
+++ b/20
@ -0,0 +1,20 @@
+FROM node:6-alpine
+
+COPY . /cryptpad
+WORKDIR /cryptpad
+
+RUN apk add --no-cache git tini \
+   && npm install \
+   && npm install -g bower \
+   && bower install --allow-root
+
+EXPOSE 3000
+
+VOLUME /cryptpad/datastore
+VOLUME /cryptpad/customize
+
+ENV USE_SSL=false
+ENV STORAGE='./storage/file'
+ENV LOG_TO_STDOUT=true
+
+CMD ["/sbin/tini", "--", "/cryptpad/container-start.sh"]
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@ -1,309 +0,0 @@
-;(function () { 'use strict';
-const Crypto = require('crypto');
-const Nacl = require('tweetnacl');
-
-const LAG_MAX_BEFORE_DISCONNECT = 30000;
-const LAG_MAX_BEFORE_PING = 15000;
-const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex');
-
-const USE_HISTORY_KEEPER = true;
-const USE_FILE_BACKUP_STORAGE = true;
-
-let dropUser;
-let historyKeeperKeys = {};
-
-const now = function () { return (new Date()).getTime(); };
-
-const socketSendable = function (socket) {
-    return socket && socket.readyState === 1;
-};
-
-const sendMsg = function (ctx, user, msg) {
-    if (!socketSendable(user.socket)) { return; }
-    try {
-        if (ctx.config.logToStdout) { console.log('<' + JSON.stringify(msg)); }
-        user.socket.send(JSON.stringify(msg));
-    } catch (e) {
-        console.log(e.stack);
-        dropUser(ctx, user);
-    }
-};
-
-const storeMessage = function (ctx, channel, msg) {
-    ctx.store.message(channel.id, msg, function (err) {
-        if (err && typeof(err) !== 'function') {
-            // ignore functions because older datastores
-            // might pass waitFors into the callback
-            console.log("Error writing message: " + err);
-        }
-    });
-};
-
-const sendChannelMessage = function (ctx, channel, msgStruct) {
-    msgStruct.unshift(0);
-    channel.forEach(function (user) {
-      if(msgStruct[2] !== 'MSG' || user.id !== msgStruct[1]) { // We don't want to send back a message to its sender, in order to save bandwidth
-        sendMsg(ctx, user, msgStruct);
-      }
-    });
-    if (USE_HISTORY_KEEPER && msgStruct[2] === 'MSG') {
-        if (historyKeeperKeys[channel.id]) {
-            let signedMsg = msgStruct[4].replace(/^cp\|/, '');
-            signedMsg = Nacl.util.decodeBase64(signedMsg);
-            let validateKey = Nacl.util.decodeBase64(historyKeeperKeys[channel.id]);
-            let validated = Nacl.sign.open(signedMsg, validateKey);
-            if (!validated) {
-                console.log("Signed message rejected");
-                return;
-            }
-        }
-        storeMessage(ctx, channel, JSON.stringify(msgStruct));
-    }
-};
-
-dropUser = function (ctx, user) {
-    if (user.socket.readyState !== 2 /* WebSocket.CLOSING */
-        && user.socket.readyState !== 3 /* WebSocket.CLOSED */)
-    {
-        try {
-            user.socket.close();
-        } catch (e) {
-            console.log("Failed to disconnect ["+user.id+"], attempting to terminate");
-            try {
-                user.socket.terminate();
-            } catch (ee) {
-                console.log("Failed to terminate ["+user.id+"]  *shrug*");
-            }
-        }
-    }
-    delete ctx.users[user.id];
-    Object.keys(ctx.channels).forEach(function (chanName) {
-        let chan = ctx.channels[chanName];
-        let idx = chan.indexOf(user);
-        if (idx < 0) { return; }
-
-        if (ctx.config.verbose) {
-            console.log("Removing ["+user.id+"] from channel ["+chanName+"]");
-        }
-        chan.splice(idx, 1);
-        if (chan.length === 0) {
-            if (ctx.config.verbose) {
-                console.log("Removing empty channel ["+chanName+"]");
-            }
-            delete ctx.channels[chanName];
-            delete historyKeeperKeys[chanName];
-
-            /*  Call removeChannel if it is a function and channel removal is
-                set to true in the config file */
-            if (ctx.config.removeChannels) {
-                if (typeof(ctx.store.removeChannel) === 'function') {
-                    ctx.timeouts[chanName] = setTimeout(function () {
-                        ctx.store.removeChannel(chanName, function (err) {
-                            if (err) { console.error("[removeChannelErr]: %s", err); }
-                            else {
-                                if (ctx.config.verbose) {
-                                    console.log("Deleted channel [%s] history from database...", chanName);
-                                }
-                            }
-                        });
-                    }, ctx.config.channelRemovalTimeout);
-                } else {
-                    console.error("You have configured your server to remove empty channels, " +
-                        "however, the database adaptor you are using has not implemented this behaviour.");
-                }
-            }
-        } else {
-            sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chanName, 'Quit: [ dropUser() ]']);
-        }
-    });
-};
-
-const getHistory = function (ctx, channelName, handler, cb) {
-    var messageBuf = [];
-    var messageKey;
-    ctx.store.getMessages(channelName, function (msgStr) {
-        var parsed = JSON.parse(msgStr);
-        if (parsed.validateKey) {
-            historyKeeperKeys[channelName] = parsed.validateKey;
-            handler(parsed);
-            return;
-        }
-        messageBuf.push(parsed);
-    }, function (err) {
-        if (err) {
-            console.log("Error getting messages " + err.stack);
-            // TODO: handle this better
-        }
-        var startPoint;
-        var cpCount = 0;
-        var msgBuff2 = [];
-        for (startPoint = messageBuf.length - 1; startPoint >= 0; startPoint--) {
-            var msg = messageBuf[startPoint];
-            msgBuff2.push(msg);
-            if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) {
-                cpCount++;
-                if (cpCount >= 2) {
-                    for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
-                    break;
-                }
-            }
-            //console.log(messageBuf[startPoint]);
-        }
-        if (cpCount < 2) {
-            // no checkpoints.
-            for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
-        }
-        cb(messageBuf);
-    });
-};
-
-const randName = function () { return Crypto.randomBytes(16).toString('hex'); };
-
-const handleMessage = function (ctx, user, msg) {
-    let json = JSON.parse(msg);
-    let seq = json.shift();
-    let cmd = json[0];
-    let obj = json[1];
-
-    user.timeOfLastMessage = now();
-    user.pingOutstanding = false;
-
-    if (cmd === 'JOIN') {
-        if (obj && obj.length !== 32) {
-            sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]);
-            return;
-        }
-        let chanName = obj || randName();
-        sendMsg(ctx, user, [seq, 'JACK', chanName]);
-        let chan = ctx.channels[chanName] = ctx.channels[chanName] || [];
-
-        // prevent removal of the channel if there is a pending timeout
-        if (ctx.config.removeChannels && ctx.timeouts[chanName]) {
-            clearTimeout(ctx.timeouts[chanName]);
-        }
-
-        chan.id = chanName;
-        if (USE_HISTORY_KEEPER) {
-            sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'JOIN', chanName]);
-        }
-        chan.forEach(function (u) { sendMsg(ctx, user, [0, u.id, 'JOIN', chanName]); });
-        chan.push(user);
-        sendChannelMessage(ctx, chan, [user.id, 'JOIN', chanName]);
-        return;
-    }
-    if (cmd === 'MSG') {
-        if (obj === HISTORY_KEEPER_ID) {
-            let parsed;
-            try { parsed = JSON.parse(json[2]); } catch (err) { console.error(err); return; }
-            if (parsed[0] === 'GET_HISTORY') {
-                sendMsg(ctx, user, [seq, 'ACK']);
-                getHistory(ctx, parsed[1], function (msg) {
-                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
-                }, function (messages) {
-                    // parsed[2] is a validation key if it exists
-                    if (messages.length === 0 && parsed[2] && !historyKeeperKeys[parsed[1]]) {
-                        var key = {channel: parsed[1], validateKey: parsed[2]};
-                        storeMessage(ctx, ctx.channels[parsed[1]], JSON.stringify(key));
-                        historyKeeperKeys[parsed[1]] = parsed[2];
-                    }
-                    let parsedMsg = {state: 1, channel: parsed[1]};
-                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(parsedMsg)]);
-                });
-            }
-            return;
-        }
-        if (obj && !ctx.channels[obj] && !ctx.users[obj]) {
-            sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]);
-            return;
-        }
-        sendMsg(ctx, user, [seq, 'ACK']);
-        let target;
-        json.unshift(user.id);
-        if ((target = ctx.channels[obj])) {
-            sendChannelMessage(ctx, target, json);
-            return;
-        }
-        if ((target = ctx.users[obj])) {
-            json.unshift(0);
-            sendMsg(ctx, target, json);
-            return;
-        }
-    }
-    if (cmd === 'LEAVE') {
-        let err;
-        let chan;
-        let idx;
-        if (!obj) { err = 'EINVAL'; obj = 'undefined';}
-        if (!err && !(chan = ctx.channels[obj])) { err = 'ENOENT'; }
-        if (!err && (idx = chan.indexOf(user)) === -1) { err = 'NOT_IN_CHAN'; }
-        if (err) {
-            sendMsg(ctx, user, [seq, 'ERROR', err, obj]);
-            return;
-        }
-        sendMsg(ctx, user, [seq, 'ACK']);
-        json.unshift(user.id);
-        sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chan.id]);
-        chan.splice(idx, 1);
-    }
-    if (cmd === 'PING') {
-        sendMsg(ctx, user, [seq, 'ACK']);
-        return;
-    }
-};
-
-let run = module.exports.run = function (storage, socketServer, config) {
-    /*  Channel removal timeout defaults to 60000ms (one minute) */
-    config.channelRemovalTimeout =
-        typeof(config.channelRemovalTimeout) === 'number'?
-            config.channelRemovalTimeout:
-            60000;
-
-    let ctx = {
-        users: {},
-        channels: {},
-        timeouts: {},
-        store: storage,
-        config: config
-    };
-    setInterval(function () {
-        Object.keys(ctx.users).forEach(function (userId) {
-            let u = ctx.users[userId];
-            if (now() - u.timeOfLastMessage > LAG_MAX_BEFORE_DISCONNECT) {
-                dropUser(ctx, u);
-            } else if (!u.pingOutstanding && now() - u.timeOfLastMessage > LAG_MAX_BEFORE_PING) {
-                sendMsg(ctx, u, [0, '', 'PING', now()]);
-                u.pingOutstanding = true;
-            }
-        });
-    }, 5000);
-    socketServer.on('connection', function(socket) {
-        if(socket.upgradeReq.url !== (config.websocketPath || '/cryptpad_websocket')) { return; }
-        let conn = socket.upgradeReq.connection;
-        let user = {
-            addr: conn.remoteAddress + '|' + conn.remotePort,
-            socket: socket,
-            id: randName(),
-            timeOfLastMessage: now(),
-            pingOutstanding: false
-        };
-        ctx.users[user.id] = user;
-        sendMsg(ctx, user, [0, '', 'IDENT', user.id]);
-        socket.on('message', function(message) {
-            if (ctx.config.logToStdout) { console.log('>'+message); }
-            try {
-                handleMessage(ctx, user, message);
-            } catch (e) {
-                console.log(e.stack);
-                dropUser(ctx, user);
-            }
-        });
-        socket.on('close', function (evt) {
-            for (let userId in ctx.users) {
-                if (ctx.users[userId].socket === socket) {
-                    dropUser(ctx, ctx.users[userId]);
-                }
-            }
-        });
-    });
-};
-}());
--- a/TestSelenium.js
+++ b/TestSelenium.js
@ -1,6 +1,13 @@
 /* global process */
 var WebDriver = require("selenium-webdriver");
+var nThen = require('nthen');

+if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'false') {
+    // We can't do saucelabs on pull requests so don't fail.
+    return;
+}
+
+// https://wiki.saucelabs.com/display/DOCS/Platform+Configurator#/
 var driver;
 if (process.env.SAUCE_USERNAME !== undefined) {
    var browserArray = process.env.BROWSER.split(':');
@ -16,15 +23,59 @@ if (process.env.SAUCE_USERNAME !== undefined) {
    driver = new WebDriver.Builder().withCapabilities({ browserName: "chrome" }).build();
 }

-driver.get('http://localhost:3000/assert/');
-var report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000);
-report.getAttribute("class").then(function (cls) {
-    driver.quit();
-    if (!cls) {
-        throw new Error("cls is null");
-    } else if (cls.indexOf("failure") !== -1) {
-        throw new Error("cls contains the word failure");
-    } else if (cls.indexOf("success") === -1) {
-        throw new Error("cls does not contain the word success");
-    }
+var SC_GET_DATA = "return (window.__CRYPTPAD_TEST__) ? window.__CRYPTPAD_TEST__.getData() : '[]'";
+
+var failed = false;
+var nt = nThen;
+[
+    //'/register/#?test=test',
+    '/assert/#?test=test',
+  //  '/auth/#?test=test' // TODO(cjd): Not working on automatic tests, understand why.
+].forEach(function (path) {
+    if (failed) { return; }
+    var url = 'http://localhost:3000' + path;
+    nt = nt(function (waitFor) {
+        var done = waitFor();
+        console.log('\n\n-----TEST ' + url + ' -----');
+        var waitTo = setTimeout(function () {
+            console.log("no report in 20 seconds, timing out");
+            failed = true;
+            done();
+            done = undefined;
+        }, 20000);
+        var logMore = function () {
+            if (!done) { return; }
+            driver.executeScript(SC_GET_DATA).then(waitFor(function (dataS) {
+                if (!done) { return; }
+                var data = JSON.parse(dataS);
+                data.forEach(function (d) {
+                    if (d.type !== 'log') { return; }
+                    console.log('>' + d.val);
+                });
+                data.forEach(function (d) {
+                    if (d.type !== 'report') { return; }
+                    console.log('RESULT: ' + d.val);
+                    if (d.val !== 'passed') {
+                        if (d.error) {
+                            console.log(d.error.message);
+                            console.log(d.error.stack);
+                        }
+                        failed = true;
+                    }
+                    clearTimeout(waitTo);
+                    console.log('-----END TEST ' + url + ' -----');
+                    done();
+                    done = undefined;
+                });
+                if (done) { setTimeout(logMore, 50); }
+            }));
+        };
+        driver.get(url).then(waitFor(logMore));
+    }).nThen;
+});
+
+nt(function (waitFor) {
+    driver.quit().then(waitFor(function () {
+        if (failed) { process.exit(100); }
+    }));
 });
--- a/WebRTCSrv.js
+++ b/WebRTCSrv.js
@ -1,61 +0,0 @@
-'use strict'
-let WebSocketServer = require('ws').Server
-const UNSUPPORTED_DATA = 1007
-const POLICY_VIOLATION = 1008
-const CLOSE_UNSUPPORTED = 1003
-
-var run = module.exports.run = function(server) {
-  server.on('connection', (socket) => {
-    if(socket.upgradeReq.url !== '/cryptpad_webrtc') { return; }
-    socket.on('message', (data) => {
-      try {
-        let msg = JSON.parse(data)
-        console.log(msg)
-        if (msg.hasOwnProperty('key')) {
-          for (let master of server.clients) {
-            if (master.key === msg.key) {
-              socket.close(POLICY_VIOLATION, 'The key already exists')
-              return
-            }
-          }
-          socket.key = msg.key
-          socket.joiningClients = []
-        } else if (msg.hasOwnProperty('id')) {
-          for (let index in socket.joiningClients) {
-            if (index == msg.id) {
-              socket.joiningClients[index].send(JSON.stringify({data: msg.data}))
-              return
-            }
-          }
-          socket.close(POLICY_VIOLATION, 'Unknown id')
-        } else if (msg.hasOwnProperty('join')) {
-          for (let master of server.clients) {
-            if (master.key === msg.join) {
-              socket.master = master
-              master.joiningClients.push(socket)
-              let id = master.joiningClients.length - 1
-              master.send(JSON.stringify({id, data: msg.data}))
-              return
-            }
-          }
-          socket.close(POLICY_VIOLATION, 'Unknown key')
-        } else if (msg.hasOwnProperty('data') && socket.hasOwnProperty('master')) {
-          let id = socket.master.joiningClients.indexOf(socket)
-          socket.master.send(JSON.stringify({id, data: msg.data}))
-        } else {
-          socket.close(UNSUPPORTED_DATA, 'Unsupported message format')
-        }
-      } catch (event) {
-        socket.close(CLOSE_UNSUPPORTED, 'Server accepts only JSON')
-      }
-    })
-
-    socket.on('close', (event) => {
-      if (socket.hasOwnProperty('joiningClients')) {
-        for (let client of socket.joiningClients) {
-          client.close(POLICY_VIOLATION, 'The peer is no longer available')
-        }
-      }
-    });
-  })
-}
--- a/bower.json
+++ b/bower.json
@ -19,28 +19,26 @@
  ],
  "dependencies": {
    "jquery": "~2.1.3",
-    "tweetnacl": "~0.12.2",
+    "tweetnacl": "0.12.2",
    "components-font-awesome": "^4.6.3",
-    "ckeditor": "~4.5.6",
+    "ckeditor": "~4.7",
    "codemirror": "^5.19.0",
-    "requirejs": "~2.1.15",
-    "reconnectingWebsocket": "",
-    "marked": "~0.3.5",
+    "requirejs": "2.1.15",
+    "marked": "0.3.5",
    "rangy": "rangy-release#~1.3.0",
    "json.sortify": "~2.1.0",
-    "fabric.js": "fabric#~1.6.0",
-    "hyperjson": "~1.3.1",
+    "secure-fabric.js": "secure-v1.7.9",
+    "hyperjson": "~1.4.0",
    "textpatcher": "^1.3.0",
-    "proxy-polyfill": "^0.1.5",
-    "chainpad": "^0.2.2",
-    "chainpad-json-validator": "^0.1.1",
+    "chainpad-json-validator": "^0.2.0",
    "chainpad-crypto": "^0.1.3",
-    "chainpad-listmap": "^0.2.0",
-    "lil-uri": "^0.2.1",
-    "file-saver": "^1.3.1",
-    "diff-dom": "#gh-pages",
-    "alertifyjs": "^1.0.11",
-    "spin.js": "^2.3.2",
-    "scrypt-async": "^1.2.0"
+    "chainpad-listmap": "^0.3.0",
+    "file-saver": "1.3.1",
+    "alertifyjs": "1.0.11",
+    "scrypt-async": "1.2.0",
+    "require-css": "0.1.10",
+    "less": "^2.7.2",
+    "bootstrap": "#v4.0.0-alpha.6",
+    "diff-dom": "2.1.1"
  }
 }
--- a/config.example.js
+++ b/config.example.js
@ -0,0 +1,293 @@
+/*@flow*/
+/*
+    globals module
+*/
+module.exports = {
+
+    // the address you want to bind to, :: means all ipv4 and ipv6 addresses
+    // this may not work on all operating systems
+    httpAddress: '::',
+
+    // the port on which your httpd will listen
+
+    /*  CryptPad can be configured to send customized HTTP Headers
+     *  These settings may vary widely depending on your needs
+     *  Examples are provided below
+     */
+
+    httpHeaders: {
+        "X-XSS-Protection": "1; mode=block",
+        "X-Content-Type-Options": "nosniff",
+        // 'X-Frame-Options': 'SAMEORIGIN',
+    },
+
+    contentSecurity: [
+        "default-src 'none'",
+        "style-src 'unsafe-inline' 'self'",
+        "script-src 'self'",
+        "font-src 'self' data:",
+
+        /*  child-src is used to restrict iframes to a set of allowed domains.
+         *  connect-src is used to restrict what domains can connect to the websocket.
+         *
+         *  it is recommended that you configure these fields to match the
+         *  domain which will serve your CryptPad instance.
+         */
+        "child-src 'self' blob: *",
+
+        "media-src * blob:",
+
+        /*  this allows connections over secure or insecure websockets
+            if you are deploying to production, you'll probably want to remove
+            the ws://* directive, and change '*' to your domain
+         */
+        "connect-src 'self' ws: wss: blob:",
+
+        // data: is used by codemirror
+        "img-src 'self' data: blob:",
+
+        // for accounts.cryptpad.fr authentication
+        "frame-ancestors 'self' accounts.cryptpad.fr",
+    ].join('; '),
+
+    // CKEditor requires significantly more lax content security policy in order to function.
+    padContentSecurity: [
+        "default-src 'none'",
+        "style-src 'unsafe-inline' 'self'",
+        // Unsafe inline, unsafe-eval are needed for ckeditor :(
+        "script-src 'self' 'unsafe-eval' 'unsafe-inline'",
+        "font-src 'self'",
+
+        /*  See above under 'contentSecurity' as to how these values should be
+         *  configured for best effect.
+         */
+         "child-src 'self' *",
+
+        // see the comment above in the 'contentSecurity' section
+         "connect-src 'self' ws: wss:",
+
+        // (insecure remote) images are included by users of the wysiwyg who embed photos in their pads
+        "img-src * blob:",
+    ].join('; '),
+
+    httpPort: 3000,
+
+    /*  your server's websocket url is configurable
+     *  (default: '/cryptpad_websocket')
+     *
+     *  websocketPath can be relative, of the form '/path/to/websocket'
+     *  or absolute, specifying a particular URL
+     *
+     *  'wss://cryptpad.fr:3000/cryptpad_websocket'
+     */
+    websocketPath: '/cryptpad_websocket',
+
+    /*  it is assumed that your websocket will bind to the same port as http
+     *  you can override this behaviour by supplying a number via websocketPort
+     */
+    //websocketPort: 3000,
+
+    /*  if you want to run a different version of CryptPad but using the same websocket
+     *  server, you should use the other server port as websocketPort and disable
+     *  the websockets on that server
+     */
+    //useExternalWebsocket: false,
+
+    /*  If CryptPad is proxied without using https, the server needs to know.
+     *  Specify 'useSecureWebsockets: true' so that it can send
+     *  Content Security Policy Headers that prevent http and https from mixing
+     */
+     useSecureWebsockets: false,
+
+    /*  CryptPad can log activity to stdout
+     *  This may be useful for debugging
+     */
+    logToStdout: false,
+
+    /*  CryptPad supports verbose logging
+     *  (false by default)
+     */
+     verbose: false,
+
+    /*  Main pages
+     *  add exceptions to the router so that we can access /privacy.html
+     *  and other odd pages
+     */
+    mainPages: [
+        'index',
+        'privacy',
+        'terms',
+        'about',
+        'contact',
+    ],
+
+    /*  Limits, Donations, Subscriptions and Contact
+     *
+     *  By default, CryptPad limits every registered user to 50MB of storage. It also shows a
+     *  donate button which allows for making a donation to support CryptPad development.
+     *
+     *  You can either:
+     *    A: Leave it exactly as it is.
+     *    B: Hide the donate button.
+     *    C: Change the donate button to a subscribe button, people who subscribe will get more
+     *       storage on your instance and you get 50% of the revenue earned.
+     * 
+     *  CryptPad is developed by people who need to live and who deserve an equivilent life to
+     *  what they would get at a company which monitizes user data. However, we intend to have
+     *  a mutually positive relationship with every one of our users, including you. If you are
+     *  getting value from CryptPad, you should be giving equal value back.
+     * 
+     *  If you are using CryptPad in a business context, please consider taking a support contract
+     *  by contacting sales@cryptpad.fr
+     *
+     *  If you choose A then there's nothing to do.
+     *
+     *  If you choose B, set this variable to true and it will remove the donate button.
+     */
+    removeDonateButton: false,
+    /*
+     *  If you choose C, set allowSubscriptions to true, then set myDomain to the domain which people
+     *  use to reach your CryptPad instance. Then contact sales@cryptpad.fr and tell us your domain.
+     *  We will tell you what is needed to get paid.
+     */
+    allowSubscriptions: false,
+    myDomain: 'i.did.not.read.my.config.myserver.tld',
+
+    /*
+     *  If you are using CryptPad internally and you want to increase the per-user storage limit,
+     *  change the following value.
+     *
+     *  Please note: This limit is what makes people subscribe and what pays for CryptPad
+     *    development. Running a public instance that provides a "better deal" than cryptpad.fr
+     *    is effectively using the project against itself.
+     */
+    defaultStorageLimit: 50 * 1024 * 1024,
+
+    /*
+     *  By default, CryptPad also contacts our accounts server once a day to check for changes in
+     *  the people who have accounts. This check-in will also send the version of your CryptPad
+     *  instance and your email so we can reach you if we are aware of a serious problem. We will
+     *  never sell it or send you marketing mail. If you want to block this check-in and remain
+     *  completely invisible, set this and allowSubscriptions both to false.
+     */
+    adminEmail: 'i.did.not.read.my.config@cryptpad.fr',
+
+
+    /*
+        You have the option of specifying an alternative storage adaptor.
+        These status of these alternatives are specified in their READMEs,
+        which are available at the following URLs:
+
+        mongodb: a noSQL database
+            https://github.com/xwiki-labs/cryptpad-mongo-store
+        amnesiadb: in memory storage
+            https://github.com/xwiki-labs/cryptpad-amnesia-store
+        leveldb: a simple, fast, key-value store
+            https://github.com/xwiki-labs/cryptpad-level-store
+        sql: an adaptor for a variety of sql databases via knexjs
+            https://github.com/xwiki-labs/cryptpad-sql-store
+
+        For the most up to date solution, use the default storage adaptor.
+    */
+    storage: './storage/file',
+
+    /*
+        CryptPad stores each document in an individual file on your hard drive.
+        Specify a directory where files should be stored.
+        It will be created automatically if it does not already exist.
+    */
+    filePath: './datastore/',
+
+    /*  CryptPad allows logged in users to request that particular documents be
+     *  stored by the server indefinitely. This is called 'pinning'.
+     *  Pin requests are stored in a pin-store. The location of this store is
+     *  defined here.
+     */
+    pinPath: './pins',
+
+    /*  CryptPad allows logged in users to upload encrypted files. Files/blobs
+     *  are stored in a 'blob-store'. Set its location here.
+     */
+    blobPath: './blob',
+
+    /*  CryptPad stores incomplete blobs in a 'staging' area until they are
+     *  fully uploaded. Set its location here.
+     */
+    blobStagingPath: './blobstage',
+
+    /*  CryptPad's file storage adaptor closes unused files after a configurale
+     *  number of milliseconds (default 30000 (30 seconds))
+     */
+    channelExpirationMs: 30000,
+
+    /*  CryptPad's file storage adaptor is limited by the number of open files.
+     *  When the adaptor reaches openFileLimit, it will clean up older files
+     */
+    openFileLimit: 2048,
+
+    /*  CryptPad's socket server can be extended to respond to RPC calls
+     *  you can configure it to respond to custom RPC calls if you like.
+     *  provide the path to your RPC module here, or `false` if you would
+     *  like to disable the RPC interface completely
+     */
+    rpc: './rpc.js',
+
+    /*  RPC errors are shown by default, but if you really don't care,
+     *  you can suppress them
+     */
+    suppressRPCErrors: false,
+
+
+    /* WARNING: EXPERIMENTAL
+     *
+     *  CryptPad features experimental support for encrypted file upload.
+     *  Our encryption format is still liable to change. As such, we do not
+     *  guarantee that files uploaded now will be supported in the future
+     */
+
+    /*  Setting this value to anything other than true will cause file upload
+     *  attempts to be rejected outright.
+     */
+    enableUploads: false,
+
+    /*  If you have enabled file upload, you have the option of restricting it
+     *  to a list of users identified by their public keys. If this value is set
+     *  to true, your server will query a file (cryptpad/privileged.conf) when
+     *  users connect via RPC. Only users whose public keys can be found within
+     *  the file will be allowed to upload.
+     *
+     *  privileged.conf uses '#' for line comments, and splits keys by newline.
+     *  This is a temporary measure until a better quota system is in place.
+     *  registered users' public keys can be found on the settings page.
+     */
+    //restrictUploads: false,
+
+    /*  Max Upload Size (bytes)
+     *  this sets the maximum size of any one file uploaded to the server.
+     *  anything larger than this size will be rejected
+     */
+    maxUploadSize: 20 * 1024 * 1024,
+
+    /*  clients can use the /settings/ app to opt out of usage feedback
+     *  which informs the server of things like how much each app is being
+     *  used, and whether certain clientside features are supported by
+     *  the client's browser. The intent is to provide feedback to the admin
+     *  such that the service can be improved. Enable this with `true`
+     *  and ignore feedback with `false` or by commenting the attribute
+     */
+    //logFeedback: true,
+
+    /*  If you wish to see which remote procedure calls clients request,
+     *  set this to true
+     */
+    //logRPC: true,
+
+    /* it is recommended that you serve CryptPad over https
+     * the filepaths below are used to configure your certificates
+     */
+    //privKeyAndCertFiles: [
+    //  '/etc/apache2/ssl/my_secret.key',
+    //  '/etc/apache2/ssl/my_public_cert.crt',
+    //  '/etc/apache2/ssl/my_certificate_authorities_cert_chain.ca'
+    //],
+};
--- a/config.js.dist
+++ b/config.js.dist
@ -1,113 +0,0 @@
-/*
-    globals module
-*/
-module.exports = {
-
-    // the address you want to bind to, :: means all ipv4 and ipv6 addresses
-    // this may not work on all operating systems
-    httpAddress: '::',
-
-    // the port on which your httpd will listen
-
-    /*  Cryptpad can be configured to send customized HTTP Headers
-     *  These settings may vary widely depending on your needs
-     *  Examples are provided below
-     */
-
-/*
-    httpHeaders: {
-        "Content-Security-Policy": [
-            "default-serc 'none'",
-            "style-src 'unsafe-inline' 'self'",
-            "script-src 'self' 'unsafe-eval' 'unsafe-inline'",
-            "child-src 'self' cryptpad.fr *.cryptpad.fr",
-            "font-src 'self'",
-            "connect-src 'self' wss://cryptpad.fr",
-    // data: is used by codemirror, (insecure remote) images are included by
-    // users of the wysiwyg who embed photos in their pads
-            "img-src data: *",
-        ].join('; '),
-
-        "X-XSS-Protection": "1; mode=block",
-        "X-Content-Type-Options": "nosniff",
-        // 'X-Frame-Options': 'SAMEORIGIN',
-    },*/
-
-    httpPort: 3000,
-
-    /*  your server's websocket url is configurable
-     *  (default: '/cryptpad_websocket')
-     *
-     *  websocketPath can be relative, of the form '/path/to/websocket'
-     *  or absolute, specifying a particular URL
-     *
-     *  'wss://cryptpad.fr:3000/cryptpad_websocket'
-     */
-    websocketPath: '/cryptpad_websocket',
-
-    /*  it is assumed that your websocket will bind to the same port as http
-     *  you can override this behaviour by supplying a number via websocketPort
-     */
-    //websocketPort: 3000,
-
-    /*  If Cryptpad is proxied without using https, the server needs to know.
-     *  Specify 'useSecureWebsockets: true' so that it can send
-     *  Content Security Policy Headers that prevent http and https from mixing
-     */
-     useSecureWebsockets: false,
-
-    /*  Cryptpad can log activity to stdout
-     *  This may be useful for debugging
-     */
-    logToStdout: false,
-
-    /*  Cryptpad supports verbose logging
-     *  (false by default)
-     */
-     verbose: false,
-
-
-    /*
-        You have the option of specifying an alternative storage adaptor.
-        These status of these alternatives are specified in their READMEs,
-        which are available at the following URLs:
-
-        mongodb: a noSQL database
-            https://github.com/xwiki-labs/cryptpad-mongo-store
-        amnesiadb: in memory storage
-            https://github.com/xwiki-labs/cryptpad-amnesia-store
-        leveldb: a simple, fast, key-value store
-            https://github.com/xwiki-labs/cryptpad-level-store
-        sql: an adaptor for a variety of sql databases via knexjs
-            https://github.com/xwiki-labs/cryptpad-sql-store
-
-        For the most up to date solution, use the default storage adaptor.
-    */
-    storage: './storage/file',
-
-    /*
-        Cryptpad stores each document in an individual file on your hard drive.
-        Specify a directory where files should be stored.
-        It will be created automatically if it does not already exist.
-    */
-    filePath: './datastore/',
-
-    /*  Cryptpad's file storage adaptor closes unused files after a configurale
-     *  number of milliseconds (default 30000 (30 seconds))
-     */
-    channelExpirationMs: 30000,
-
-    /*  Cryptpad's file storage adaptor is limited by the number of open files.
-     *  When the adaptor reaches openFileLimit, it will clean up older files
-     */
-    openFileLimit: 2048,
-
-    /* it is recommended that you serve cryptpad over https
-     * the filepaths below are used to configure your certificates
-     */
-    //privKeyAndCertFiles: [
-    //  '/etc/apache2/ssl/my_secret.key',
-    //  '/etc/apache2/ssl/my_public_cert.crt',
-    //  '/etc/apache2/ssl/my_certificate_authorities_cert_chain.ca'
-    //],
-};
--- a/container-start.sh
+++ b/container-start.sh
@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Creating customize folder
+mkdir -p customize
+[ -z "$(ls -A customize)" ] && echo "Creating customize folder" \
+  && cp -R customize.dist/* customize/ \
+  && cp config.example.js customize/config.js
+
+# Linking config.js
+[ ! -h config.js ] && echo "Linking config.js" && ln -s customize/config.js config.js
+
+# Configure
+[ -n "$USE_SSL" ] && echo "Using secure websockets: $USE_SSL" \
+  && sed -i "s/useSecureWebsockets: .*/useSecureWebsockets: ${USE_SSL},/g" customize/config.js
+
+[ -n "$STORAGE" ] && echo "Using storage adapter: $STORAGE" \
+  && sed -i "s/storage: .*/storage: ${STORAGE},/g" customize/config.js
+
+[ -n "$LOG_TO_STDOUT" ] && echo "Logging to stdout: $LOG_TO_STDOUT" \
+  && sed -i "s/logToStdout: .*/logToStdout: ${LOG_TO_STDOUT},/g" customize/config.js
+
+
+exec node ./server.js
--- a/customize.dist/BottomBar.html
+++ b/customize.dist/BottomBar.html
@ -1,16 +0,0 @@
-<!-- This is an HTML fragment which is included into the bottom toolbar -->
-<div>
-  <div class="bottom-bar">
-    <div class="bottom-bar-left">
-      <span class="bottom-bar-language">
-        <select id="language-selector"></select>
-      </span>
-      <p data-localization="bottom_france">
-      </p>
-   </div>
-    <div class="bottom-bar-right">
-      <p data-localization="bottom_support">
-      </p>
-    </div>
-  </div>
-</div>
--- a/customize.dist/DecorateToolbar.js
+++ b/customize.dist/DecorateToolbar.js
@ -1,40 +0,0 @@
-/*
-    globals define
-*/
-define([
-    '/customize/languageSelector.js',
-    '/customize/messages.js',
-    '/bower_components/jquery/dist/jquery.min.js'
-], function (LS, Messages) {
-    var $ = window.jQuery;
-    var main = function () {
-        var url = window.location.pathname;
-        var isHtml = /\.html/.test(url) || url === '/' || url === '';
-        var isPoll = /\/poll\//.test(url);
-        if (!isHtml && !isPoll) {
-            Messages._applyTranslation();
-            return;
-        }
-        $.ajax({
-            url: isHtml ? '/customize/BottomBar.html' : '/customize/Header.html',
-            success: function (ret) {
-                var $bar = $(ret);
-                $('body').append($bar);
-
-                var $sel = $bar.find('#language-selector');
-
-                Object.keys(Messages._languages).forEach(function (code) {
-                    $sel.append($('<option>', {
-                        value: code,
-                    }).text(Messages._languages[code]));
-                });
-
-                LS.main();
-                Messages._applyTranslation();
-            }
-        });
-    };
-    return {
-        main: main
-    };
-});
--- a/customize.dist/Header.html
+++ b/customize.dist/Header.html
@ -1,22 +0,0 @@
-<!-- This is an HTML fragment which is included into the bottom toolbar -->
-<div>
-  <div class="top-bar">
-    <div class="bottom-bar-left">
-      <span class="bottom-bar-language">
-        <select id="language-selector"></select>
-      </span>
-      <p data-localization="header_france" class="big">
-      </p>
-    </div>
-    <div class="bottom-bar-center">
-      <p><a id="cryptpad-logo" class="big" href="/" data-localization-title="header_logoTitle">CryptPad</a></p>
-      <p><a id="cryptpad-logo" class="small" href="/" data-localization-title="header_logoTitle"><img src="/customize/cryptofist_mini.png" alt="Cryptpad" class="cryptofist" /></a></p>
-    </div>
-    <div class="bottom-bar-right">
-      <p class="small">
-          <a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer"><img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>
-      <p data-localization="header_support" class="big">
-      </p>
-    </div>
-  </div>
-</div>
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
+<head>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
+</head>
+<body class="html">
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
+</html>
--- a/customize.dist/alertify.css
+++ b/customize.dist/alertify.css
@ -1,201 +0,0 @@
-.alertify-logs > * {
-  padding: 12px 48px;
-  color: #fafafa;
-  font-weight: bold;
-  font-size: large;
-  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.2);
-  border-radius: 1px;
-}
-.alertify-logs > *,
-.alertify-logs > *.default {
-  background: rgba(0, 0, 0, 0.8);
-}
-.alertify-logs > *.error {
-  background: #FF0073;
-}
-.alertify-logs > *.success {
-  background: #46E981;
-  color: #302B28;
-}
-.alertify {
-  position: fixed;
-  background-color: rgba(0, 0, 0, 0.3);
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 99999;
-}
-.alertify.hide {
-  opacity: 0;
-  pointer-events: none;
-}
-.alertify,
-.alertify.show {
-  box-sizing: border-box;
-  transition: all 0.33s cubic-bezier(0.25, 0.8, 0.25, 1);
-}
-.alertify,
-.alertify * {
-  box-sizing: border-box;
-}
-.alertify .dialog {
-  padding: 12px;
-}
-.alertify .dialog,
-.alertify .alert {
-  width: 100%;
-  margin: 0 auto;
-  position: relative;
-  top: 50%;
-  transform: translateY(-50%);
-}
-.alertify .dialog > div,
-.alertify .alert > div {
-  background-color: #685d56;
-  border-radius: 5px;
-}
-.alertify .dialog > *,
-.alertify .alert > * {
-  width: 400px;
-  max-width: 95%;
-  margin: 0 auto;
-  text-align: center;
-  padding: 12px;
-  background: #fff;
-  box-shadow: 0 2px 4px -1px rgba(0, 0, 0, 0.14), 0 4px 5px 0 rgba(0, 0, 0, 0.098), 0 1px 10px 0 rgba(0, 0, 0, 0.084);
-}
-.alertify .dialog .msg,
-.alertify .alert .msg {
-  padding: 12px;
-  margin-bottom: 12px;
-  margin: 0;
-  text-align: left;
-}
-.alertify .dialog input:not(.form-control),
-.alertify .alert input:not(.form-control) {
-  background-color: #302B28;
-  color: #fafafa;
-  border: 0px;
-  border-radius: 5px;
-  margin-bottom: 15px;
-  width: 100%;
-  font-size: 100%;
-  padding: 12px;
-}
-.alertify .dialog nav,
-.alertify .alert nav {
-  text-align: right;
-}
-.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button),
-.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button) {
-  background-color: transparent;
-  box-sizing: border-box;
-  position: relative;
-  outline: 0;
-  border: 0;
-  display: inline-block;
-  align-items: center;
-  padding: 0 6px;
-  margin: 6px 8px;
-  line-height: 36px;
-  min-height: 36px;
-  white-space: nowrap;
-  min-width: 88px;
-  text-align: center;
-  text-transform: uppercase;
-  font-size: 14px;
-  text-decoration: none;
-  cursor: pointer;
-  color: #fafafa;
-  border: 1px solid #302B28;
-  border-radius: 5px;
-}
-.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):hover,
-.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):hover,
-.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):active,
-.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):active {
-  background-color: rgba(0, 0, 0, 0.15);
-}
-.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus,
-.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus {
-  border: 1px dotted #302B28;
-}
-.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button)::-moz-focus-inner,
-.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button)::-moz-focus-inner {
-  border: 0;
-}
-.alertify .dialog nav button.btn,
-.alertify .alert nav button.btn {
-  margin: 6px 4px;
-}
-.alertify-logs {
-  position: fixed;
-  z-index: 99999;
-}
-.alertify-logs.bottom,
-.alertify-logs:not(.top) {
-  bottom: 16px;
-}
-.alertify-logs.left,
-.alertify-logs:not(.right) {
-  left: 16px;
-}
-.alertify-logs.left > *,
-.alertify-logs:not(.right) > * {
-  float: left;
-  transform: translate3d(0, 0, 0);
-  height: auto;
-}
-.alertify-logs.left > *.show,
-.alertify-logs:not(.right) > *.show {
-  left: 0;
-}
-.alertify-logs.left > *,
-.alertify-logs:not(.right) > *,
-.alertify-logs.left > *.hide,
-.alertify-logs:not(.right) > *.hide {
-  left: -110%;
-}
-.alertify-logs.right {
-  right: 16px;
-}
-.alertify-logs.right > * {
-  float: right;
-  transform: translate3d(0, 0, 0);
-}
-.alertify-logs.right > *.show {
-  right: 0;
-  opacity: 1;
-}
-.alertify-logs.right > *,
-.alertify-logs.right > *.hide {
-  right: -110%;
-  opacity: 0;
-}
-.alertify-logs.top {
-  top: 0;
-}
-.alertify-logs > * {
-  box-sizing: border-box;
-  transition: all 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
-  position: relative;
-  clear: both;
-  backface-visibility: hidden;
-  perspective: 1000;
-  max-height: 0;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-  opacity: 0;
-  pointer-events: none;
-}
-.alertify-logs > *.show {
-  margin-top: 12px;
-  opacity: 1;
-  max-height: 1000px;
-  padding: 12px;
-  pointer-events: auto;
-}
--- a/customize.dist/alt-favicon.png
+++ b/customize.dist/alt-favicon.png
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@ -4,7 +4,51 @@ define(function() {
    /* Select the buttons displayed on the main page to create new collaborative sessions
     * Existing types : pad, code, poll, slide
     */
-    config.availablePadTypes = ['pad', 'code', 'slide', 'poll'];
+    config.availablePadTypes = ['drive', 'pad', 'code', 'slide', 'poll', 'whiteboard', 'file', 'contacts'];
+    config.registeredOnlyTypes = ['file', 'contacts'];
+
+    /*  Cryptpad apps use a common API to display notifications to users
+     *  by default, notifications are hidden after 5 seconds
+     *  You can change their duration here (measured in milliseconds)
+     */
+    config.notificationTimeout = 5000;
+
+    config.enablePinning = true;
+
+    config.whiteboardPalette = [
+        '#000000', // black
+        '#FFFFFF', // white
+        '#848484', // grey
+        '#8B4513', // saddlebrown
+        '#FF0000', // red
+        '#FF8080', // peach?
+        '#FF8000', // orange
+        '#FFFF00', // yellow
+        '#80FF80', // light green
+        '#00FF00', // green
+        '#00FFFF', // cyan
+        '#008B8B', // dark cyan
+        '#0000FF', // blue
+        '#FF00FF', // fuschia
+        '#FF00C0', // hot pink
+        '#800080', // purple
+    ];
+
+    config.enableTemplates = true;
+
+    config.enableHistory = true;
+
+    /*  user passwords are hashed with scrypt, and salted with their username.
+        this value will be appended to the username, causing the resulting hash
+        to differ from other CryptPad instances if customized. This makes it
+        such that anyone who wants to bruteforce common credentials must do so
+        again on each CryptPad instance that they wish to attack.
+
+        WARNING: this should only be set when your CryptPad instance is first
+        created. Changing it at a later time will break logins for all existing
+        users.
+    */
+    config.loginSalt = '';

    return config;
 });
--- a/customize.dist/bg3.jpg
+++ b/customize.dist/bg3.jpg
--- a/customize.dist/ckeditor-config.js
+++ b/customize.dist/ckeditor-config.js
@ -0,0 +1,57 @@
+/* global CKEDITOR */
+CKEDITOR.editorConfig = function( config ) {
+    var fixThings = false;
+    // https://dev.ckeditor.com/ticket/10907
+    config.needsBrFiller= fixThings;
+    config.needsNbspFiller= fixThings;
+
+    config.removeButtons= 'Source,Maximize';
+    // magicline plugin inserts html crap into the document which is not part of the
+    // document itself and causes problems when it's sent across the wire and reflected back
+    config.removePlugins= 'resize,elementspath';
+    config.resize_enabled= false; //bottom-bar
+    config.extraPlugins= 'autolink,colorbutton,colordialog,font,indentblock,justify';
+    config.toolbarGroups= [
+        // {"name":"clipboard","groups":["clipboard","undo"]},
+        //{"name":"editing","groups":["find","selection"]},
+        {"name":"links"},
+        {"name":"insert"},
+        {"name":"forms"},
+        {"name":"tools"},
+        {"name":"document","groups":["mode","document","doctools"]},
+        {"name":"others"},
+        {"name":"basicstyles","groups":["basicstyles","cleanup"]},
+        {"name":"paragraph","groups":["list","indent","blocks","align","bidi"]},
+        {"name":"styles"},
+        {"name":"colors"}];
+
+    config.font_defaultLabel = 'Arial';
+    config.fontSize_defaultLabel = '16';
+    config.contentsCss = '/customize/ckeditor-contents.css';
+
+    config.keystrokes = [
+        [ CKEDITOR.ALT + 121 /*F10*/, 'toolbarFocus' ],
+        [ CKEDITOR.ALT + 122 /*F11*/, 'elementsPathFocus' ],
+
+        [ CKEDITOR.SHIFT + 121 /*F10*/, 'contextMenu' ],
+
+        [ CKEDITOR.CTRL + 90 /*Z*/, 'undo' ],
+        [ CKEDITOR.CTRL + 89 /*Y*/, 'redo' ],
+        [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'redo' ],
+
+        [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 76 /*L*/, 'link' ],
+        [ CKEDITOR.CTRL + 76 /*L*/, undefined ],
+
+        [ CKEDITOR.CTRL + 66 /*B*/, 'bold' ],
+        [ CKEDITOR.CTRL + 73 /*I*/, 'italic' ],
+        [ CKEDITOR.CTRL + 85 /*U*/, 'underline' ],
+
+        [ CKEDITOR.ALT + 109 /*-*/, 'toolbarCollapse' ]
+    ];
+
+    //skin: 'moono-cryptpad,/pad/themes/moono-cryptpad/'
+    //skin: 'flat,/pad/themes/flat/'
+    //config.skin= 'moono-lisa,/pad/themes/moono-lisa/'
+    //skin: 'moono-dark,/pad/themes/moono-dark/'
+    //skin: 'office2013,/pad/themes/office2013/'
+};
--- a/customize.dist/ckeditor-contents.css
+++ b/customize.dist/ckeditor-contents.css
@ -0,0 +1,135 @@
+/*
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+
+body
+{
+	/* Font */
+	font-family: sans-serif, Arial, Verdana, "Trebuchet MS";
+	font-size: 13px;
+
+	/* Text color */
+	color: #333;
+
+	/* Remove the background color to make it transparent */
+	background-color: #fff;
+
+	margin: 20px;
+}
+
+.cke_editable
+{
+	font-size: 16px;
+	line-height: 1.6;
+
+	/* Fix for missing scrollbars with RTL texts. (#10488) */
+	word-wrap: break-word;
+}
+
+blockquote
+{
+	font-style: italic;
+	font-family: Georgia, Times, "Times New Roman", serif;
+	padding: 2px 0;
+	border-style: solid;
+	border-color: #ccc;
+	border-width: 0;
+}
+
+.cke_contents_ltr blockquote
+{
+	padding-left: 20px;
+	padding-right: 8px;
+	border-left-width: 5px;
+}
+
+.cke_contents_rtl blockquote
+{
+	padding-left: 8px;
+	padding-right: 20px;
+	border-right-width: 5px;
+}
+
+a
+{
+	color: #0782C1;
+}
+
+ol,ul,dl
+{
+	/* IE7: reset rtl list margin. (#7334) */
+	*margin-right: 0px;
+	/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
+	padding: 0 40px;
+}
+
+h1,h2,h3,h4,h5,h6
+{
+	font-weight: normal;
+	line-height: 1.2;
+}
+
+hr
+{
+	border: 0px;
+	border-top: 1px solid #ccc;
+}
+
+img.right
+{
+	border: 1px solid #ccc;
+	float: right;
+	margin-left: 15px;
+	padding: 5px;
+}
+
+img.left
+{
+	border: 1px solid #ccc;
+	float: left;
+	margin-right: 15px;
+	padding: 5px;
+}
+
+pre
+{
+	white-space: pre-wrap; /* CSS 2.1 */
+	word-wrap: break-word; /* IE7 */
+	-moz-tab-size: 4;
+	tab-size: 4;
+}
+
+.marker
+{
+	background-color: Yellow;
+}
+
+span[lang]
+{
+	font-style: italic;
+}
+
+figure
+{
+	text-align: center;
+	border: solid 1px #ccc;
+	border-radius: 2px;
+	background: rgba(0,0,0,0.05);
+	padding: 10px;
+	margin: 10px 20px;
+	display: inline-block;
+}
+
+figure > figcaption
+{
+	text-align: center;
+	display: block; /* For IE8 */
+}
+
+a > img {
+	padding: 1px;
+	margin: 1px;
+	border: none;
+	outline: 1px solid #0782C1;
+}
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
+<head>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
+</head>
+<body class="html">
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
+</html>
--- a/customize.dist/cryptofist_mini.png
+++ b/customize.dist/cryptofist_mini.png
--- a/customize.dist/cryptofist_small.png
+++ b/customize.dist/cryptofist_small.png
--- a/customize.dist/fr.png
+++ b/customize.dist/fr.png
--- a/customize.dist/header.js
+++ b/customize.dist/header.js
@ -0,0 +1,54 @@
+define([
+    'jquery',
+    '/customize/application_config.js',
+    '/common/cryptpad-common.js',
+    '/api/config',
+], function ($, Config, Cryptpad, ApiConfig) {
+
+    window.APP = {
+        Cryptpad: Cryptpad,
+    };
+
+    var Messages = Cryptpad.Messages;
+
+    $(function () {
+        // Language selector
+        var $sel = $('#language-selector');
+        Cryptpad.createLanguageSelector(undefined, $sel);
+        $sel.find('button').addClass('btn').addClass('btn-secondary');
+        $sel.show();
+
+        var $upgrade = $('#upgrade');
+
+        var showUpgrade = function (text, feedback, url) {
+            if (ApiConfig.removeDonateButton) { return; }
+            if (localStorage.plan) { return; }
+            if (!text) { return; }
+            $upgrade.text(text).show();
+            $upgrade.click(function () {
+                Cryptpad.feedback(feedback);
+                window.open(url,'_blank');
+            });
+        };
+
+        // User admin menu
+        var $userMenu = $('#user-menu');
+        var userMenuCfg = {
+            $initBlock: $userMenu,
+            'static': true
+        };
+        var $userAdmin = Cryptpad.createUserAdminMenu(userMenuCfg);
+        $userAdmin.find('button').addClass('btn').addClass('btn-secondary');
+
+        $(window).click(function () {
+            $('.cryptpad-dropdown').hide();
+        });
+
+        if (Cryptpad.isLoggedIn() && ApiConfig.allowSubscriptions) {
+            showUpgrade(Messages.upgradeAccount, "HOME_UPGRADE_ACCOUNT", Cryptpad.upgradeURL);
+        } else {
+            showUpgrade(Messages.supportCryptpad, "HOME_SUPPORT_CRYPTPAD", Cryptpad.donateURL);
+        }
+    });
+});
+
--- a/customize.dist/heart.png
+++ b/customize.dist/heart.png
--- a/customize.dist/images/avatar.png
+++ b/customize.dist/images/avatar.png
--- a/customize.dist/images/code.png
+++ b/customize.dist/images/code.png
--- a/customize.dist/images/hash.png
+++ b/customize.dist/images/hash.png
--- a/customize.dist/images/icons/folder.svg
+++ b/customize.dist/images/icons/folder.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 13"><defs><style>.cls-1{fill:#444;}</style></defs><title>Asset 2</title><g id="Layer_2" data-name="Layer 2"><g id="_490_Icons" data-name="490 Icons"><path class="cls-1" d="M7,0,9,2h7V13H0V0Z"/></g></g></svg>
--- a/customize.dist/images/icons/folderOpen.svg
+++ b/customize.dist/images/icons/folderOpen.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15.44 13"><defs><style>.cls-1{fill:#444;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="_490_Icons" data-name="490 Icons"><path class="cls-1" d="M13,13l2.44-6.5h-13L0,13ZM2,4,0,13V0H4.5l2,2H13V4Z"/></g></g></svg>
--- a/customize.dist/images/icons/ic_folder_black_24px.svg
+++ b/customize.dist/images/icons/ic_folder_black_24px.svg
@ -0,0 +1,4 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
--- a/customize.dist/images/icons/ic_folder_open_black_24px.svg
+++ b/customize.dist/images/icons/ic_folder_open_black_24px.svg
@ -0,0 +1,4 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z"/>
+</svg>
--- a/customize.dist/images/key_small.png
+++ b/customize.dist/images/key_small.png
--- a/customize.dist/images/organize.png
+++ b/customize.dist/images/organize.png
--- a/customize.dist/images/pad.png
+++ b/customize.dist/images/pad.png
--- a/customize.dist/images/poll.png
+++ b/customize.dist/images/poll.png
--- a/customize.dist/images/realtime_small.png
+++ b/customize.dist/images/realtime_small.png
--- a/customize.dist/images/slide.png
+++ b/customize.dist/images/slide.png
--- a/customize.dist/images/useraccount.png
+++ b/customize.dist/images/useraccount.png
--- a/customize.dist/images/zeroknowledge_small.png
+++ b/customize.dist/images/zeroknowledge_small.png
--- a/customize.dist/images/zk.png
+++ b/customize.dist/images/zk.png
--- a/customize.dist/index.css
+++ b/customize.dist/index.css
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@ -1,96 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
-    <script src="/bower_components/requirejs/require.js"></script>
-    <script>
-        require.config({
-            waitSeconds: 60,
-        });
-    </script>
-        <!-- Piwik -->
-    <script type="text/javascript">
-      if (window.location.href.indexOf('cryptpad.fr') !== -1) {
-          // This piwik is only relevant to cryptpad.fr
-          var _paq = _paq || [];
-          _paq.push(['trackPageView']);
-          _paq.push(['enableLinkTracking']);
-          (function() {
-            var u="//piwik.xwiki.com/";
-            _paq.push(['setTrackerUrl', u+'piwik.php']);
-            _paq.push(['setSiteId', 12]);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-          })();
-      }
-    </script>
-    <!-- End Piwik Code -->
-
-
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
-<body>
-        <a href="https://github.com/xwiki-labs/cryptpad" class="github-corner" title="Star it, Fork it, or submit issues on Github!" target="_blank"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style><!-- Thanks! http://tholman.com/github-corners/ -->
-
-
-
-    <div id="main">
-      <center>
-          <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
-          <h1 data-localization="main_slogan">Unity is Strength - Collaboration is Key</h1>
-
-      </center>
-      <p data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
-
-      <p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p>
-
-      <h2 id="howitworks" data-localization="main_howitworks"></h2>
-      <p data-localization="main_howitworks_p1"><!-- Operational transform, Nakamoto blockchain, server kept unaware of the content--></p>
-
-      <h2 id="about-us" data-localization="main_about"></h2>
-
-      <p data-localization="main_about_p1"><!-- Privacy policy, terms of service --></p>
-      <p data-localization="main_about_p2"><!-- Contact us--></p>
-
-      <center>
-        <noscript>
-          <p>
-            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-          </p>
-          <hr>
-          <p>
-            <strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.
-          </p>
-        </noscript>
-        <h5 id="tryit" data-localization="tryIt"></h5>
-
-        <table class="recent scroll" style="display:none">
-            <tbody>
-
-            <tr>
-                <th data-localization="table_type"></th>
-                <th data-localization="table_link"></th>
-                <th data-localization="table_created"></th>
-                <th data-localization="table_last"></th>
-                <th></th>
-            </tr>
-
-            </tbody>
-        </table>
-
-        <div id="buttons" class="buttons">
-          <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a>
-          <a id="create-code" class="button create" href="/code/" data-localization="button_newcode"></a>
-          <a id="create-poll" class="button create" href="/poll/" data-localization="button_newpoll"></a>
-          <a id="create-slide" class="button create" href="/slide/" data-localization="button_newslide"></a>
-        </div>
-      </center>
-
-
-    </div>
-</body>
+<body class="html">
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
 </html>
-
--- a/customize.dist/languageSelector.js
+++ b/customize.dist/languageSelector.js
@ -1,49 +0,0 @@
-define(['/bower_components/jquery/dist/jquery.min.js'], function() {
-    var $ = window.jQuery;
-    var out = {};
-
-    var LS_LANG = "CRYPTPAD_LANG";
-
-    var getStoredLanguage = function () {
-        return localStorage.getItem(LS_LANG);
-    };
-
-    var storeLanguage = function (l) {
-        localStorage.setItem(LS_LANG, l);
-    };
-
-    var getBrowserLanguage = function () {
-        return navigator.language || navigator.userLanguage;
-    };
-
-    var getLanguage = out.getLanguage = function () {
-        return getStoredLanguage() || getBrowserLanguage();
-    };
-
-    var main = out.main = function ($select) {
-        var selector = $select || $('#language-selector');
-        if (!selector.length) { return; }
-
-        // Select the current language in the list
-        var language = getLanguage();
-        var option = $(selector).find('option[value="' + language + '"]');
-        if ($(option).length) {
-            $(selector).val(language);
-        }
-        else {
-            $(selector).val('en');
-        }
-
-        // Listen for language change
-        $(selector).on('change', function () {
-            var newLanguage = $(selector).val();
-            storeLanguage(newLanguage);
-            if (newLanguage !== language) {
-                window.location.reload();
-            }
-        });
-
-    };
-
-    return out;
-});
--- a/customize.dist/logo-xwiki.png
+++ b/customize.dist/logo-xwiki.png
--- a/customize.dist/logo-xwiki2.png
+++ b/customize.dist/logo-xwiki2.png
--- a/customize.dist/main-favicon.png
+++ b/customize.dist/main-favicon.png
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@ -1,561 +0,0 @@
-a.github-corner > svg {
-  fill: #46E981;
-  color: #302B28;
-}
-.table-refresh > svg {
-  width: .9em;
-  height: .9em;
-  fill: #46E981;
-  -webkit-transform: translate(0, 15%);
-  -moz-transform: translate(0, 15%);
-  -o-transform: translate(0, 15%);
-  -ms-transform: translate(0, 15%);
-  transform: translate(0, 15%);
-}
-.lato {
-  font-family: lato, Helvetica, sans-serif;
-  font-size: 1.02em;
-}
-html {
-  font-size: .875em;
-  background-color: #302B28;
-  color: #fafafa;
-}
-html,
-body {
-  font-family: Georgia,Cambria,serif;
-  height: 100%;
-}
-body {
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 2rem;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  color: #fafafa;
-  font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  -webkit-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;
-  -moz-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;
-  font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;
-  font-style: normal;
-  font-weight: 600;
-  margin-top: 0;
-}
-h1 {
-  line-height: 3rem;
-  font-size: 2.05714rem;
-  margin-bottom: .21999rem;
-  padding-top: .78001rem;
-}
-h2 {
-  font-size: 1.95312rem;
-  margin-bottom: .18358rem;
-  padding-top: .81642rem;
-}
-h2,
-h3 {
-  line-height: 3rem;
-}
-h3 {
-  font-size: 1.64571rem;
-  margin-bottom: .07599rem;
-  padding-top: .92401rem;
-}
-h4 {
-  font-size: 1.5625rem;
-  margin-bottom: .54686rem;
-  padding-top: .45314rem;
-}
-h5 {
-  font-size: 1.25rem;
-  margin-bottom: -0.56251rem;
-  padding-top: .56251rem;
-}
-h6 {
-  font-size: 1rem;
-  margin-bottom: -0.65001rem;
-  padding-top: .65001rem;
-}
-a {
-  cursor: pointer;
-  color: #46E981;
-  text-decoration: none;
-}
-a:hover {
-  color: #a1f4bf;
-}
-img {
-  height: auto;
-  max-width: 100%;
-}
-img.cryptofist {
-  filter: invert(100%);
-  -webkit-filter: invert(100%);
-}
-p {
-  padding-top: .66001rem;
-  margin-top: 0;
-}
-p,
-pre {
-  margin-bottom: 1.33999rem;
-}
-p,
-pre,
-td,
-a,
-table,
-tr {
-  font-family: lato, Helvetica, sans-serif;
-  font-size: 1.02em;
-}
-#main {
-  width: 70vw;
-  margin: auto;
-  font-size: medium;
-  padding-bottom: 1em;
-}
-/* buttons */
-.create,
-.action {
-  border: 2px solid #46E981;
-  border-radius: 10px;
-  background-color: #302B28;
-  color: #46E981;
-  font-weight: bold;
-  font-size: large;
-  margin-right: 5px;
-  margin-left: 5px;
-}
-.create:hover,
-.action:hover {
-  border: 2px solid #a1f4bf;
-  color: #46E981;
-}
-.create {
-  display: none;
-}
-.action {
-  display: inline-block;
-}
-.buttons {
-  margin-bottom: 50px;
-  margin-top: 20px;
-  line-height: 2.5em;
-}
-.button {
-  padding: 4px 12px 4px 12px;
-  border-radius: 5px;
-  margin-top: 12px;
-  margin-bottom: 12px;
-  white-space: nowrap;
-}
-.alertify button {
-  margin: 3px 0px;
-}
-/* Tables */
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin: 20px;
-}
-tbody {
-  border: 2px solid black;
-}
-tbody tr {
-  text-align: center;
-}
-tbody tr:first-of-type th {
-  font-size: 20px;
-  border-top: 0px;
-  font-weight: bold;
-  padding: 10px;
-  text-decoration: underline;
-}
-tbody tr:first-of-type th.table-refresh {
-  color: #46E981;
-  text-decoration: none;
-  cursor: pointer;
-}
-tbody tr:nth-child(odd) {
-  background-color: #685d56;
-}
-tbody tr th:first-of-type {
-  border-left: 0px;
-}
-tbody tr th {
-  box-sizing: border-box;
-  border: 1px solid black;
-}
-tbody tr th,
-tbody tr td {
-  color: #fafafa;
-}
-tbody tr th.remove,
-tbody tr td.remove {
-  cursor: pointer;
-}
-tbody tr th:last-child {
-  border-right: 0px;
-}
-tbody td {
-  border-right: 1px solid black;
-  padding: 12px;
-  padding-top: 0px;
-  padding-bottom: 0px;
-}
-tbody td:last-child {
-  border-right: none;
-}
-/* Bottom Bar */
-.top-bar,
-.bottom-bar {
-  position: fixed;
-  height: 4%;
-  height: 2.5em;
-  display: inline-block;
-  width: 100%;
-  background: #302B28;
-  border-top: 1px solid #444;
-}
-.top-bar a,
-.bottom-bar a {
-  color: #46E981;
-  text-decoration: none;
-}
-.top-bar p,
-.bottom-bar p {
-  margin: -1px;
-  font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
-  font-size: 20px;
-  display: block;
-  margin-left: 10px;
-  padding-top: 3px;
-  color: #fafafa;
-}
-.top-bar img,
-.bottom-bar img {
-  margin-right: 4px;
-  position: relative;
-}
-@media screen and (max-width: 800px) {
-  .top-bar .big,
-  .bottom-bar .big {
-    display: none;
-  }
-}
-@media screen and (min-width: 801px) {
-  .top-bar .big,
-  .bottom-bar .big {
-    display: inline-block;
-  }
-}
-@media screen and (max-width: 800px) {
-  .top-bar .small,
-  .bottom-bar .small {
-    display: inline-block;
-  }
-}
-@media screen and (min-width: 801px) {
-  .top-bar .small,
-  .bottom-bar .small {
-    display: none;
-  }
-}
-.top-bar .small img,
-.bottom-bar .small img {
-  height: 1.25em;
-}
-.bottom-bar {
-  bottom: 0px;
-  right: 0px;
-}
-.top-bar {
-  top: 0px;
-  right: 0px;
-}
-.bottom-bar-left {
-  display: block;
-  float: left;
-  padding-left: 10px;
-}
-.bottom-bar-left p {
-  float: right;
-}
-.bottom-bar-right {
-  display: block;
-  float: right;
-  padding-right: 20px;
-}
-.bottom-bar-center {
-  width: 20%;
-  position: absolute;
-  left: 40%;
-  text-align: center;
-}
-.bottom-bar-heart {
-  top: 2px;
-}
-.bottom-bar-xwiki {
-  top: 3px;
-}
-.bottom-bar-openpaas {
-  top: 3px;
-  max-width: 100px;
-}
-.bottom-left {
-  border-bottom-left-radius: 5px;
-}
-.top-left {
-  border-top-left-radius: 5px;
-}
-.remove {
-  color: #FF0073;
-  cursor: pointer !important;
-}
-form.realtime {
-  padding: 0px;
-  margin: 0px;
-}
-form.realtime > textarea {
-  width: 50%;
-  height: 15vh;
-}
-form.realtime table {
-  border-collapse: collapse;
-}
-form.realtime table tr td {
-  padding: 0px;
-  margin: 0px;
-}
-form.realtime table tr td div.text-cell {
-  padding: 0px;
-  margin: 0px;
-  height: 100%;
-}
-form.realtime table tr td div.text-cell input {
-  width: 80%;
-  height: 100%;
-  border: 0px;
-}
-form.realtime table tr td div.text-cell input[disabled] {
-  background-color: transparent;
-  color: #fafafa;
-  font-weight: bold;
-}
-form.realtime table tr td.checkbox-cell {
-  margin: 0px;
-  padding: 0px;
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain {
-  display: block;
-  height: 100%;
-  width: 100%;
-  position: relative;
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain label {
-  background-color: transparent;
-  display: block;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  height: 100%;
-  width: 100%;
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) {
-  display: none;
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover {
-  font-weight: bold;
-  background-color: #FF0073;
-  color: #302B28;
-  display: block;
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover:after {
-  content: "✖";
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover.yes {
-  background-color: #46E981;
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover.yes:after {
-  content: "✔";
-}
-form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover.mine {
-  display: none;
-}
-form.realtime table input[type="text"] {
-  height: 100%;
-  width: 80%;
-  border: 3px solid #302B28;
-}
-form.realtime table .edit {
-  color: #46E981;
-  cursor: pointer;
-  width: 10%;
-  font-size: 20px;
-}
-form.realtime table .edit:after {
-  content: '✐';
-}
-form.realtime table .edit.editable {
-  display: none;
-}
-form.realtime table thead tr th input[type="text"][disabled] {
-  background-color: transparent;
-  color: #fafafa;
-  font-weight: bold;
-}
-form.realtime table thead tr th .remove {
-  cursor: pointer;
-  font-size: 20px;
-}
-form.realtime table tfoot tr td {
-  text-align: center;
-}
-form.realtime table tfoot tr td .save {
-  padding: 15px;
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-}
-form.realtime #adduser,
-form.realtime #addoption {
-  color: #46E981;
-  border: 1px solid #46E981;
-  padding: 15px;
-  cursor: pointer;
-}
-form.realtime #adduser {
-  border-top-left-radius: 5px;
-}
-form.realtime #addoption {
-  border-bottom-left-radius: 5px;
-}
-div.modal,
-div#modal {
-  box-sizing: border-box;
-  z-index: 9001;
-  position: fixed;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 100vh;
-  display: none;
-  background-color: #302B28;
-}
-div.modal #content,
-div#modal #content {
-  box-sizing: border-box;
-  border: 1px solid white;
-  vertical-align: middle;
-  padding: 2.5vw;
-  width: 100vw;
-  height: 56.25vw;
-  max-height: 100vh;
-  max-width: 177.78vh;
-  margin: auto;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
-div.modal #content p,
-div#modal #content p,
-div.modal #content li,
-div#modal #content li,
-div.modal #content pre,
-div#modal #content pre,
-div.modal #content code,
-div#modal #content code {
-  font-size: 2.75vw;
-  line-height: 3.025vw;
-}
-div.modal #content h1,
-div#modal #content h1 {
-  font-size: 5vw;
-  line-height: 5.5vw;
-}
-div.modal #content h2,
-div#modal #content h2 {
-  font-size: 4.2vw;
-  line-height: 4.62vw;
-}
-div.modal #content h3,
-div#modal #content h3 {
-  font-size: 3.6vw;
-  line-height: 3.96vw;
-}
-div.modal #content h4,
-div#modal #content h4 {
-  font-size: 3vw;
-  line-height: 3.3vw;
-}
-div.modal #content h5,
-div#modal #content h5 {
-  font-size: 2.2vw;
-  line-height: 2.42vw;
-}
-div.modal #content h6,
-div#modal #content h6 {
-  font-size: 1.6vw;
-  line-height: 1.76vw;
-}
-div.modal #content pre > code,
-div#modal #content pre > code {
-  display: block;
-  position: relative;
-  border: 1px solid #333;
-  width: 90%;
-  margin: auto;
-  padding-left: .25vw;
-}
-div.modal .center,
-div#modal .center {
-  position: relative;
-  width: 80%;
-  height: 80%;
-  margin: auto;
-  border: 1px solid #685d56;
-  text-align: center;
-}
-div.modal.shown,
-div#modal.shown {
-  display: block;
-}
-div.modal table,
-div#modal table {
-  margin: 30px;
-  border-collapse: collapse;
-}
-div.modal table input,
-div#modal table input {
-  height: 100%;
-  width: 90%;
-  border: 3px solid #302B28;
-}
-div.modal table tfoot tr td,
-div#modal table tfoot tr td {
-  z-index: 4000;
-  cursor: pointer;
-}
-div.modal #addtime,
-div#modal #addtime,
-div.modal #adddate,
-div#modal #adddate {
-  color: #46E981;
-  border: 1px solid #46E981;
-  padding: 15px;
-}
-div.modal #adddate,
-div#modal #adddate {
-  border-top-left-radius: 5px;
-}
-div.modal #addtime,
-div#modal #addtime {
-  border-bottom-left-radius: 5px;
-}
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@ -1,160 +1,185 @@
 define([
-    '/customize/messages.js',
-    '/customize/DecorateToolbar.js',
+    'jquery',
    '/customize/application_config.js',
    '/common/cryptpad-common.js',
-    '/bower_components/lil-uri/uri.min.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, DecorateToolbar, Config, Cryptpad, LilUri) {
-    var $ = window.$;
+    '/customize/header.js',
+], function ($, Config, Cryptpad) {

-    var APP = window.APP = {
+    window.APP = {
        Cryptpad: Cryptpad,
    };

-    var padTypes = {
-        '/pad/': Messages.type.pad,
-        '/code/': Messages.type.code,
-        '/poll/': Messages.type.poll,
-        '/slide/': Messages.type.slide,
-    };
+    var Messages = Cryptpad.Messages;

-    var $table;
-    var $tbody;
-    var $tryit;
-    var now = new Date();
-    var hasRecent = false;
+    $(function () {
+        var $main = $('#mainBlock');

-    var forgetPad = Cryptpad.forgetPad;
-
-    var displayCreateButtons = function () {
-        var $parent = $('#buttons');
-        Config.availablePadTypes.forEach(function (el) {
-            $('#create-' + el).detach().appendTo($parent).show();
-        });
-    };
-
-    var makeRecentPadsTable = function (recentPads) {
-        if (!recentPads.length) { return; }
-
-        $('tbody tr').each(function (i, e) {
-            if (!i) { return; }
-            $(this).remove();
+        $(window).click(function () {
+            $('.cryptpad-dropdown').hide();
        });

-        recentPads.some(function (pad, index) {
-            if (!pad) { return; }
+        // main block is hidden in case javascript is disabled
+        $main.removeClass('hidden');

-            hasRecent = true;
+        // Make sure we don't display non-translated content (empty button)
+        $main.find('#data').removeClass('hidden');

-            // split up the uri
-            var uri = LilUri(pad.href);
+        if (Cryptpad.isLoggedIn()) {
+            var name = localStorage[Cryptpad.userNameKey] || sessionStorage[Cryptpad.userNameKey];
+            var $loggedInBlock = $main.find('#loggedIn');
+            var $hello = $loggedInBlock.find('#loggedInHello');
+            var $logout = $loggedInBlock.find('#loggedInLogOut');

-            // derive the name
-            var name = padTypes[uri.path()];
-
-            var title = pad.title || uri.parts.hash.slice(0,8);
-            var shortTitle = Cryptpad.truncate(pad.title, 48);
-
-            var date = new Date(pad.atime).toLocaleDateString();
-            var created = new Date(pad.ctime).toLocaleDateString();
-
-            if (date === now.toLocaleDateString()) {
-                date = new Date(pad.atime).toLocaleTimeString().replace(/ /g, '');
+            if (name) {
+                $hello.text(Messages._getKey('login_hello', [name]));
+            } else {
+                $hello.text(Messages.login_helloNoName);
            }
+            $('#buttons').find('.nologin').hide();

-            var id = 'pad-'+index;
-
-            var $row = $('<tr>', {
-                id: id
-            });
-
-            var $remove = $('<td>', {
-                'class': 'remove',
-                title: Messages.forget + " '"+shortTitle + "'"
-            }).text('✖').click(function () {
-                Cryptpad.confirm(Messages.forgetPrompt + ' (' + Cryptpad.fixHTML(shortTitle) + ')', function (yes) {
-                    if (!yes) { return; }
-                    forgetPad(pad.href, function (err, data) {
-                        if (err) {
-                            console.log("Unable to forget pad");
-                            console.log(err);
-                            return;
-                        }
-                        $row.fadeOut(750, function () {
-                            $row.remove();
-                            if (!$table.find('tr').find('td').length) {
-                                $table.remove();
-                                $tryit.text(Messages.tryIt);
-                            }
-                        });
-                    });
+            $logout.click(function () {
+                Cryptpad.logout(function () {
+                    window.location.reload();
                });
            });

-            var readOnly = false;
-            if (pad.href.indexOf('#') !== -1) {
-                var modeArray = pad.href.split('#')[1].split('/');
-                if (modeArray.length >= 3 && modeArray[2] === 'view') {
-                    readOnly =  true;
-                }
-            }
-            var readOnlyText = readOnly ? '(' + Messages.readonly + ') ' : '';
-            $row
-                .append($('<td>').text(name))
-                .append($('<td>').append(readOnlyText).append($('<a>', {
-                    href: pad.href,
-                    title: pad.title,
-                }).text(shortTitle)))
-                .append($('<td>').text(created))
-                .append($('<td>').text(date))
-                .append($remove);
-            $tbody.append($row);
-        });
-    };
+            $loggedInBlock.removeClass('hidden');
+        }
+        else {
+            $main.find('#userForm').removeClass('hidden');
+            $('#name').focus();
+        }

-    var refreshTable = function () {
-        Cryptpad.getRecentPads(function (err, recentPads) {
-            if (err) {
-                console.log("unable to get recent pads");
-                console.error(err);
+        var displayCreateButtons = function () {
+            var $parent = $('#buttons');
+            var options = [];
+            var $container = $('<div>', {'class': 'dropdown-bar'}).appendTo($parent);
+            Config.availablePadTypes.forEach(function (el) {
+                if (el === 'drive') { return; }
+                if (!Cryptpad.isLoggedIn() && Config.registeredOnlyTypes &&
+                    Config.registeredOnlyTypes.indexOf(el) !== -1) { return; }
+                options.push({
+                    tag: 'a',
+                    attributes: {
+                        'class': 'newdoc',
+                        'href': '/' + el + '/',
+                        'target': '_blank'
+                    },
+                    content: Messages['button_new' + el] // Pretty name of the language value
+                });
+            });
+            var dropdownConfig = {
+                text: Messages.login_makeAPad, // Button initial text
+                options: options, // Entries displayed in the menu
+                container: $container
+            };
+            var $block = Cryptpad.createDropdown(dropdownConfig);
+            $block.find('button').addClass('btn').addClass('btn-primary');
+            $block.appendTo($parent);
+        };
+
+        /* Log in UI */
+        var Login;
+        // deferred execution to avoid unnecessary asset loading
+        var loginReady = function (cb) {
+            if (Login) {
+                if (typeof(cb) === 'function') { cb(); }
                return;
            }
+            require([
+                '/common/login.js',
+            ], function (_Login) {
+                Login = Login || _Login;
+                if (typeof(cb) === 'function') { cb(); }
+            });
+        };

-            if (recentPads.length) {
-                recentPads.sort(Cryptpad.mostRecent);
-                makeRecentPadsTable(recentPads);
-            }
+        var $uname = $('#name').on('focus', loginReady);

-            if (hasRecent) {
-                $('table').attr('style', '');
-                // Race condition here, this is triggered before the localization in HTML
-                // so we have to remove the data-localization attr
-                $tryit.removeAttr('data-localization');
-                $tryit.text(Messages.recentPads);
-            }
+        var $passwd = $('#password')
+        // background loading of login assets
+        .on('focus', loginReady)
+        // enter key while on password field clicks signup
+        .on('keyup', function (e) {
+            if (e.which !== 13) { return; } // enter
+            $('button.login').click();
        });
-    };

-    Cryptpad.ready(function () {
-        console.log("ready");
+        $('button.login').click(function () {
+            // setTimeout 100ms to remove the keyboard on mobile devices before the loading screen pops up
+            window.setTimeout(function () {
+                Cryptpad.addLoadingScreen(Messages.login_hashing);
+                // We need a setTimeout(cb, 0) otherwise the loading screen is only displayed after hashing the password
+                window.setTimeout(function () {
+                    loginReady(function () {
+                        var uname = $uname.val();
+                        var passwd = $passwd.val();
+                        Login.loginOrRegister(uname, passwd, false, function (err, result) {
+                            if (!err) {
+                                var proxy = result.proxy;

-        $table = $('table.scroll');
-        $tbody = $table.find('tbody');
-        $tryit = $('#tryit');
+                                // successful validation and user already exists
+                                // set user hash in localStorage and redirect to drive
+                                if (proxy && !proxy.login_name) {
+                                    proxy.login_name = result.userName;
+                                }

-        DecorateToolbar.main($('#bottom-bar'));
-        Cryptpad.styleAlerts();
+                                proxy.edPrivate = result.edPrivate;
+                                proxy.edPublic = result.edPublic;
+
+                                Cryptpad.whenRealtimeSyncs(result.realtime, function () {
+                                    Cryptpad.login(result.userHash, result.userName, function () {
+                                        document.location.href = '/drive/';
+                                    });
+                                });
+                                return;
+                            }
+                            switch (err) {
+                                case 'NO_SUCH_USER':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_noSuchUser);
+                                    });
+                                    break;
+                                case 'INVAL_USER':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_invalUser);
+                                    });
+                                    break;
+                                case 'INVAL_PASS':
+                                    Cryptpad.removeLoadingScreen(function () {
+                                        Cryptpad.alert(Messages.login_invalPass);
+                                    });
+                                    break;
+                                default: // UNHANDLED ERROR
+                                    Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
+                            }
+                        });
+                    });
+                }, 0);
+            }, 100);
+        });
+        /* End Log in UI */
+
+        var addButtonHandlers = function () {
+            $('button.register').click(function () {
+                var username = $('#name').val();
+                var passwd = $('#password').val();
+                sessionStorage.login_user = username;
+                sessionStorage.login_pass = passwd;
+                document.location.href = '/register/';
+            });
+            $('button.gotodrive').click(function () {
+                document.location.href = '/drive/';
+            });
+
+            $('button#loggedInLogout').click(function () {
+                $('#user-menu .logout').click();
+            });
+        };

        displayCreateButtons();
-        refreshTable();
-        if (Cryptpad.store && Cryptpad.store.change) {
-            Cryptpad.store.change(function (data) {
-                if (data.key === 'CryptPad_RECENTPADS') {
-                    refreshTable();
-                }
-            });
-        }
+
+        addButtonHandlers();
+        console.log("ready");
    });
 });
-
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@ -1,126 +1,167 @@
-define(['/customize/languageSelector.js',
-        '/customize/translations/messages.js',
-        '/customize/translations/messages.es.js',
-        '/customize/translations/messages.fr.js',
+(function () {
+var LS_LANG = "CRYPTPAD_LANG";

-    // 1) additional translation files can be added here...
+// add your module to this map so it gets used
+var map = {
+    'fr': 'Français',
+    'es': 'Español',
+    'pl': 'Polski',
+    'de': 'Deutsch',
+    'pt-br': 'Português do Brasil',
+    'ro': 'Română',
+    'zh': '繁體中文',
+};

-        '/bower_components/jquery/dist/jquery.min.js'],
+var getStoredLanguage = function () { return localStorage.getItem(LS_LANG); };
+var getBrowserLanguage = function () { return navigator.language || navigator.userLanguage; };
+var getLanguage = function () {
+    if (getStoredLanguage()) { return getStoredLanguage(); }
+    var l = getBrowserLanguage() || '';
+    if (Object.keys(map).indexOf(l) !== -1) {
+        return l;
+    }
+    // Edge returns 'fr-FR' --> transform it to 'fr' and check again
+    return Object.keys(map).indexOf(l.split('-')[0]) !== -1 ? l.split('-')[0] : 'en';
+};
+var language = getLanguage();

-    // 2) name your language module here...
-        function(LS, Default, Spanish, French) {
-    var $ = window.jQuery;
+var req = ['jquery', '/customize/translations/messages.js'];
+if (language && map[language]) { req.push('/customize/translations/messages.' + language + '.js'); }

-    // 3) add your module to this map so it gets used
-    var map = {
-        'fr': French,
-        'es': Spanish,
-    };
+define(req, function($, Default, Language) {

+    var externalMap = JSON.parse(JSON.stringify(map));
+
+    map.en = 'English';
    var defaultLanguage = 'en';

-    var language = LS.getLanguage();
-
    var messages;

-    if (!language || language === defaultLanguage || language === 'default' || !map[language]) {
+    if (!Language || !language || language === defaultLanguage || language === 'default' || !map[language]) {
        messages = Default;
    }
    else {
        // Add the translated keys to the returned object
-        messages = $.extend(true, {}, Default, map[language]);
+        messages = $.extend(true, {}, Default, Language);
    }

-    // messages_languages return the available translations and their name in an object :
-    // { "en": "English", "fr": "French", ... }
-    messages._languages = {
-        'en': Default._languageName
-    };
-    for (var l in map) {
-        messages._languages[l] = map[l]._languageName || l;
-    }
+    messages._languages = map;
+    messages._languageUsed = language;

-    messages._initSelector = LS.main;
-    messages._checkTranslationState = function () {
+    messages._checkTranslationState = function (cb) {
+        if (typeof(cb) !== "function") { return; }
        var missing = [];
-        Object.keys(map).forEach(function (code) {
-            var translation = map[code];
-            Object.keys(Default).forEach(function (k) {
-                if (/^_/.test(k) || /nitialState$/.test(k)) { return; }
-                if (!translation[k]) {
-                    var warning = "key [" + k + "] is missing from translation [" + code + "]";
-                    missing.push(warning);
-                }
-            });
-            if (typeof(translation._languageName) !== 'string') {
-                var warning = 'key [_languageName] is missing from translation [' + code + ']';
-                missing.push(warning);
-            }
+        var reqs = [];
+        Object.keys(externalMap).forEach(function (code) {
+            reqs.push('/customize/translations/messages.' + code + '.js');
+        });
+        require(reqs, function () {
+            var langs = arguments;
+            Object.keys(externalMap).forEach(function (code, i) {
+                var translation = langs[i];
+                var updated = {};
+                Object.keys(Default).forEach(function (k) {
+                    if (/^updated_[0-9]+_/.test(k) && !translation[k]) {
+                        var key = k.split('_').slice(2).join('_');
+                        // Make sure we don't already have an update for that key. It should not happen
+                        // but if it does, keep the latest version
+                        if (updated[key]) {
+                            var ek = updated[key];
+                            if (parseInt(ek.split('_')[1]) > parseInt(k.split('_')[1])) { return; }
+                        }
+                        updated[key] = k;
+                    }
+                });
+                Object.keys(Default).forEach(function (k) {
+                    if (/^_/.test(k) || k === 'driveReadme') { return; }
+                    if (!translation[k] || updated[k]) {
+                        if (updated[k]) {
+                            missing.push([code, k, 2, 'out.' + updated[k]]);
+                            return;
+                        }
+                        missing.push([code, k, 1]);
+                    }
+                });
+                Object.keys(translation).forEach(function (k) {
+                    if (/^_/.test(k) || k === 'driveReadme') { return; }
+                    if (!Default[k]) {
+                        missing.push([code, k, 0]);
+                    }
+                });
+            });
+            cb(missing);
        });
-        return missing;
    };

    // Get keys with parameters
    messages._getKey = function (key, argArray) {
        if (!messages[key]) { return '?'; }
        var text = messages[key];
-        return text.replace(/\{(\d+)\}/g, function (str, p1) {
-            return argArray[p1] || null;
+        if (typeof(text) === 'string') {
+            return text.replace(/\{(\d+)\}/g, function (str, p1) {
+                return argArray[p1] || null;
+            });
+        } else {
+            return text;
+        }
+    };
+
+    // Add handler to the language selector
+    var storeLanguage = function (l) {
+        localStorage.setItem(LS_LANG, l);
+    };
+    messages._initSelector = function ($select) {
+        var selector = $select || $('#language-selector');
+
+        if (!selector.length) { return; }
+
+        // Select the current language in the list
+        selector.setValue(language || 'English');
+
+        // Listen for language change
+        $(selector).find('a.languageValue').on('click', function () {
+            var newLanguage = $(this).attr('data-value');
+            storeLanguage(newLanguage);
+            if (newLanguage !== language) {
+                window.location.reload();
+            }
        });
    };

+    var translateText = function (i, e) {
+        var $el = $(e);
+        var key = $el.data('localization');
+        $el.html(messages[key]);
+    };
+    var translateAppend = function (i, e) {
+        var $el = $(e);
+        var key = $el.data('localization-append');
+        $el.append(messages[key]);
+    };
+    var translateTitle = function () {
+        var $el = $(this);
+        var key = $el.data('localization-title');
+        $el.attr('title', messages[key]);
+    };
+    var translatePlaceholder = function () {
+        var $el = $(this);
+        var key = $el.data('localization-placeholder');
+        $el.attr('placeholder', messages[key]);
+    };
    messages._applyTranslation = function () {
-        $('[data-localization]').each(function (i, e) {
-            var $el = $(this);
-            var key = $el.data('localization');
-            $el.html(messages[key]);
-        });
-        $('[data-localization-title]').each(function (i, e) {
-            var $el = $(this);
-            var key = $el.data('localization-title');
-            $el.attr('title', messages[key]);
-        });
+        $('[data-localization]').each(translateText);
+        $('[data-localization-append]').each(translateAppend);
+        $('#pad-iframe').contents().find('[data-localization]').each(translateText);
+        $('[data-localization-title]').each(translateTitle);
+        $('[data-localization-placeholder]').each(translatePlaceholder);
+        $('#pad-iframe').contents().find('[data-localization-title]').each(translateTitle);
    };

-    // Non translatable keys
-    messages.initialState = [
-        '<p>',
-        'This is <strong>CryptPad</strong>, the zero knowledge realtime collaborative editor.',
-        '<br>',
-        'What you type here is encrypted so only people who have the link can access it.',
-        '<br>',
-        'Even the server cannot see what you type.',
-        '</p>',
-        '<p>',
-        '<small>',
-        '<i>What you see here, what you hear here, when you leave here, let it stay here</i>',
-        '</small>',
-        '</p>',
-    ].join('');
-
-    messages.codeInitialState = [
-        '/*\n',
-        '   This is CryptPad, the zero knowledge realtime collaborative editor.\n',
-        '   What you type here is encrypted so only people who have the link can access it.\n',
-        '   Even the server cannot see what you type.\n',
-        '   What you see here, what you hear here, when you leave here, let it stay here.\n',
-        '*/'
-    ].join('');
-
-    messages.slideInitialState = [
-        '# CryptSlide\n',
-        '* This is a zero knowledge realtime collaborative editor.\n',
-        '* What you type here is encrypted so only people who have the link can access it.\n',
-        '* Even the server cannot see what you type.\n',
-        '* What you see here, what you hear here, when you leave here, let it stay here.\n',
-        '\n',
-        '---',
-        '\n',
-        '# How to use\n',
-        '1. Write your slides content using markdown syntax\n',
-        '2. Separate your slides with ---\n',
-        '3. Click on the "Play" button to see the result'
-    ].join('');
+    messages.driveReadme = '["BODY",{"class":"cke_editable cke_editable_themed cke_contents_ltr cke_show_borders","contenteditable":"true","spellcheck":"false","style":"color: rgb(51, 51, 51);"},' +
+        '[["H1",{},["'+messages.readme_welcome+'"]],["P",{},["'+messages.readme_p1+'"]],["P",{},["'+messages.readme_p2+'"]],["HR",{},[]],["H2",{},["'+messages.readme_cat1+'",["BR",{},[]]]],["UL",{},[["LI",{},["'+messages._getKey("readme_cat1_l1", ['",["STRONG",{},["'+messages.newButton+'"]],"', '",["STRONG",{},["'+messages.type.pad+'"]],"'])+'"]],["LI",{},["'+messages.readme_cat1_l2+'"]],["LI",{},["'+messages._getKey("readme_cat1_l3", ['",["STRONG",{},["'+messages.fm_unsortedName+'"]],"'])+'",["UL",{},[["LI",{},["'+messages._getKey("readme_cat1_l3_l1", ['",["STRONG",{},["'+messages.fm_rootName+'"]],"'])+'"]],["LI",{},["'+messages.readme_cat1_l3_l2+'"]]]]]],["LI",{},["'+messages._getKey("readme_cat1_l4", ['",["STRONG",{},["'+messages.fm_trashName+'"]],"'])+'",["BR",{},[]]]]]],["P",{},[["BR",{},[]]]],["H2",{},["'+messages.readme_cat2+'",["BR",{},[]]]],["UL",{},[["LI",{},["'+messages._getKey("readme_cat2_l1", ['",["STRONG",{},["'+messages.shareButton+'"]],"', '",["STRONG",{},["'+messages.edit+'"]],"', '",["STRONG",{},["'+messages.view+'"]],"'])+'"]],["LI",{},["'+messages.readme_cat2_l2+'"]]]],["P",{},[["BR",{},[]]]],["H2",{},["'+messages.readme_cat3+'"]],["UL",{},[["LI",{},["'+messages.readme_cat3_l1+'"]],["LI",{},["'+messages.readme_cat3_l2+'"]],["LI",{},["'+messages.readme_cat3_l3+'",["BR",{},[]]]]]]],' +
+        '{"metadata":{"defaultTitle":"' + messages.driveReadmeTitle + '","title":"' + messages.driveReadmeTitle + '"}}]';

    return messages;
+
 });
+}());
--- a/customize.dist/openpaas.png
+++ b/customize.dist/openpaas.png
--- a/customize.dist/openpaasng.png
+++ b/customize.dist/openpaasng.png
--- a/customize.dist/pad.js
+++ b/customize.dist/pad.js
@ -1,9 +0,0 @@
-/*
-    globals define console
-*/
-require([
-    '/customize/DecorateToolbar.js',
-    '/bower_components/jquery/dist/jquery.min.js'
-], function (Dt) {
-    Dt.main(window.$('#bottom-bar'));
-});
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@ -0,0 +1,521 @@
+define([
+    '/api/config',
+    '/common/hyperscript.js',
+    '/common/cryptpad-common.js',
+], function (Config, h, Cryptpad) {
+    var Pages = {};
+    var Msg = Cryptpad.Messages;
+    var urlArgs = Config.requireConf.urlArgs;
+
+    var setHTML = function (e, html) {
+        e.innerHTML = html;
+        return e;
+    };
+
+    var indexContent = function () {
+        return [
+            h('div.page.category.first#knowmore', [
+                h('center', [
+                    h('h1', Msg.main_howitworks)
+                ])
+            ]),
+            h('div.page', [
+                h('div.info-container', [
+                    h('div.left.image', [
+                        h('img', {
+                            src: '/customize/images/zeroknowledge_small.png?' + urlArgs ,
+                            alt: 'Zero Knowledge'
+                        })
+                    ]),
+                    h('div.right', [
+                        h('h2', Msg.main_zeroKnowledge),
+                        setHTML(h('p'), Msg.main_zeroKnowledge_p)
+                    ])
+                ])
+            ]),
+            h('div.page.even', [
+                h('div.info-container', [
+                    h('div.left', [
+                        h('h2', Msg.main_writeItDown),
+                        h('p', Msg.main_writeItDown_p)
+                    ]),
+                    h('div.right.image', [
+                        h('img', {
+                            alt: "User account",
+                            src: '/customize/images/realtime_small.png?' + urlArgs,
+                        })
+                    ])
+                ])
+            ]),
+            h('div.page', [
+                h('div.info-container', [
+                    h('div.left.image', [
+                        h('img', {
+                            src: '/customize/images/key_small.png?' + urlArgs,
+                            alt: 'User account'
+                        })
+                    ]),
+                    h('div.right', [
+                        h('h2', Msg.main_share),
+                        h('p', Msg.main_share_p)
+                    ])
+                ])
+            ]),
+            h('div.page.even', [
+                h('div.info-container', [
+                    h('div.left', [
+                        h('h2', Msg.main_organize),
+                        h('p', Msg.main_organize_p)
+                    ]),
+                    h('div.right.image', [
+                        h('img', {
+                            src: '/customize/images/organize.png?' + urlArgs,
+                            alt: 'User account'
+                        })
+                    ])
+                ])
+            ])
+        ];
+    };
+
+    Pages['/about.html'] = function () {
+        return h('div#main_other', [
+            h('center', [
+                h('h1', Msg.about)
+            ]),
+            setHTML(h('p'), Msg.main_p2),
+            h('h2', Msg.main_howitworks),
+            setHTML(h('p'), Msg.main_howitworks_p1)
+        ].concat(indexContent()));
+    };
+
+    Pages['/privacy.html'] = function () {
+        return h('div#main_other', [
+            h('center', h('h1', Msg.policy_title)),
+            h('h2', Msg.policy_whatweknow),
+            h('p', Msg.policywhatweknow_p1),
+
+            h('h2', Msg.policy_howweuse),
+            h('p', Msg.policy_howweuse_p1),
+            h('p', Msg.policy_howweuse_p2),
+
+            h('h2', Msg.policy_whatwetell),
+            h('p', Msg.policy_whatwetell_p1),
+
+            h('h2', Msg.policy_links),
+            h('p', Msg.policy_links_p1),
+
+            h('h2', Msg.policy_ads),
+            h('p', Msg.policy_ads_p1),
+
+            h('h2', Msg.policy_choices),
+            h('p', Msg.policy_choices_open),
+            setHTML(h('p'), Msg.policy_choices_vpn),
+
+            h('br')
+        ]);
+    };
+
+    Pages['/terms.html'] = function () {
+        return h('div#main_other', [
+            h('center', h('h1', Msg.tos_title)),
+            h('p', Msg.tos_legal),
+            h('p', Msg.tos_availability),
+            h('p', Msg.tos_e2ee),
+            h('p', Msg.tos_logs),
+            h('p', Msg.tos_3rdparties),
+        ]);
+    };
+
+    Pages['/contact.html'] = function () {
+        return h('div#main_other', [
+            h('center', h('h1', Msg.contact)),
+            setHTML(h('p'), Msg.main_about_p2)
+        ]);
+    };
+
+    var userForm = function () {
+        return h('div#userForm.form-group.hidden', [
+            h('input#name.form-control', {
+                name: 'name',
+                type: 'text',
+                placeholder: Msg.login_username
+            }),
+            h('input#password.form-control', {
+                name: 'password',
+                type: 'password',
+                placeholder: Msg.login_password
+            }),
+            h('div', {
+                style: { display: 'none' }
+            }, [
+                h('span.remember.form-check', [
+                    h('label.form-check-label', {
+                        'for': 'rememberme',
+                        placeholder: Msg.login_remember,
+                    }, [
+                        h('input#rememberme.form-check-input', {
+                            type: 'checkbox',
+                            checked: true
+                        })
+                    ])
+                ])
+            ]),
+            h('button.btn.btn-secondary.login.half.first', Msg.login_login),
+            h('button.btn.btn-success.register.half', Msg.login_register),
+            h('p.separator', Msg.login_orNoLogin),
+            h('p#buttons.buttons'),
+            h('p.driveLink', [
+                h('a.gotodrive', {
+                    href: '/drive/'
+                }, Msg.login_nologin)
+            ])
+        ]);
+    };
+
+
+    var appButton = function (alt, h2, img, p, url, btn, id) {
+        return h('div.app', [
+            h('center', [
+                h('h2', h2),
+                h('img', {
+                    alt: 'Rich Text application',
+                    src: img,
+                })
+            ]),
+            setHTML(h('p'), p),
+            h('p.buttons', [
+                h('a#' + id, {
+                    href: url,
+                }, [
+                    h('button.btn.btn-secondary', btn),
+                ])
+            ])
+        ]);
+    };
+
+    var tryIt = function () {
+        return [
+            h('div.class.category#tryit', [
+                h('center', [
+                    h('h1', Msg.tryIt)
+                ])
+            ]),
+            h('div.page', [
+                h('div.app-container', [
+                    h('div.app-row', [
+                        appButton("Rich Text application",
+                            Msg.main_richText,
+                            '/customize/images/pad.png?' + urlArgs,
+                            Msg.main_richText_p,
+                            '/pad/',
+                            Msg.button_newpad,
+                            'create-pad'),
+                        appButton('Code application',
+                            Msg.main_code,
+                            '/customize/images/code.png?' + urlArgs,
+                            Msg.main_code_p,
+                            '/code/',
+                            Msg.button_newcode,
+                            'create-code'),
+                        appButton('Slide application',
+                            Msg.main_slide,
+                            '/customize/images/slide.png?' + urlArgs,
+                            Msg.main_slide_p,
+                            '/slide/',
+                            Msg.button_newslide,
+                            'create-slide'),
+                        appButton('Poll application',
+                            Msg.main_poll,
+                            '/customize/images/poll.png?' + urlArgs,
+                            Msg.main_poll_p,
+                            '/poll/',
+                            Msg.button_newpoll,
+                            'create-poll')
+                    ])
+                ])
+            ])
+        ];
+    };
+
+    Pages['/'] = Pages['/index.html'] = function () {
+        return [
+            h('div#main', [
+                h('div.mainOverlay'),
+                h('div#align-container', [
+                    h('div#main-container', [
+                        h('div#data.hidden', [
+                            setHTML(h('p.left'), Msg.main_info),
+                        ]),
+                        userForm(),
+                        h('div#loggedIn.hidden', [
+                            h('p#loggedInHello'),
+                            h('p', [
+                                h('button.btn.btn-primary.gotodrive', Msg.login_accessDrive),
+                            ]),
+                            h('p', [
+                                h('button#loggedInLogout.btn.btn-secondary', Msg.logoutButton)
+                            ])
+                        ])
+                    ])
+                ]),
+            ])
+        ]
+        .concat(tryIt());
+    };
+
+    var loadingScreen = function () {
+        return h('div#loading', 
+            h('div.loadingContainer', [
+                h('img.cryptofist', {
+                    src: '/customize/cryptofist_small.png?' + urlArgs
+                }),
+                h('div.spinnerContainer',
+                    h('span.fa.fa-spinner.fa-pulse.fa-4x.fa-fw')),
+                h('p', Msg.loading)
+            ])
+        );
+    };
+    loadingScreen = loadingScreen; // TODO use this
+
+    Pages['/user/'] = Pages['/user/index.html'] = function () {
+        return h('div#container');
+    };
+
+    Pages['/register/'] = Pages['/register/index.html'] = function () {
+        return [h('div#main', [
+            h('div.mainOverlay'),
+            h('div#align-container', [
+                h('div#data.hidden', [
+                    h('h1', Msg.register_header),
+                    h('br'),
+                    setHTML(h('p.left.register-explanation'), Msg.register_explanation)
+                ]),
+                h('div#userForm.form-group.hidden', [
+                    h('input.form-control#username', {
+                        type: 'text',
+                        autocomplete: 'off',
+                        autocorrect: 'off',
+                        autocapitalize: 'off',
+                        spellcheck: false,
+                        placeholder: Msg.login_username,
+                        autofocus: true,
+                    }),
+                    h('input.form-control#password', {
+                        type: 'password',
+                        placeholder: Msg.login_password,
+                    }),
+                    h('input.form-control#password-confirm', {
+                        type: 'password',
+                        placeholder: Msg.login_confirm,
+                    }),
+                    h('input#import-recent', {
+                        type: 'checkbox',
+                        checked: true
+                    }),
+                    h('label', {
+                        'for': 'import-recent',
+                    }, Msg.register_importRecent),
+                    h('br'),
+                    h('input#accept-terms', {
+                        type: 'checkbox'
+                    }),
+                    setHTML(h('label', {
+                        'for': 'accept-terms',
+                    }), Msg.register_acceptTerms),
+                    h('br'),
+                    h('button#register.btn.btn-primary', Msg.login_register)
+                ])
+            ])
+        ])];
+    };
+
+    Pages['/login/'] = Pages['/login/index.html'] = function () {
+        return [h('div#main', [
+            h('div.mainOverlay'),
+            h('div#align-container',
+                h('div#main-container', [
+                    h('div#data.hidden', setHTML(h('p.left'), Msg.main_info)),
+                    h('div#userForm.form-group.hidden', [
+                        h('input.form-control#name', {
+                            name: 'name',
+                            type: 'text',
+                            autocomplete: 'off',
+                            autocorrect: 'off',
+                            autocapitalize: 'off',
+                            spellcheck: false,
+                            placeholder: Msg.login_username,
+                            autofocus: true,
+                        }),
+                        h('input.form-control#password', {
+                            type: 'password',
+                            'name': 'password',
+                            placeholder: Msg.login_password,
+                        }),
+                        h('button.btn.btn-primary.login.first', Msg.login_login),
+                        h('div.extra', [
+                            h('p', Msg.login_notRegistered),
+                            h('button#register.btn.btn-success.register', Msg.login_register)
+                        ])
+                    ])
+                ])
+            )
+        ])];
+    };
+
+    var appToolbar = function () {
+        return h('div#toolbar.toolbar-container');
+    };
+
+    Pages['/whiteboard/'] = Pages['/whiteboard/index.html'] = function () {
+        return [
+            appToolbar(),
+            h('div#canvas-area', h('canvas#canvas', {
+                width: 600,
+                height: 600
+            })),
+            h('div#controls', {
+                style: {
+                    display: 'block',
+                }
+            }, [
+                h('button#clear', Msg.canvas_clear), ' ',
+                h('button#toggleDraw', Msg.canvas_disable),
+                h('button#delete', {
+                    style: {
+                        display: 'none',
+                    }
+                }),
+                h('input#width', {
+                    type: 'range',
+                    value: "5",
+                    min: "1",
+                    max: "100"
+                }),
+                h('label', {
+                    'for': 'width'
+                }, Msg.canvas_width),
+                h('input#opacity', {
+                    type: 'range',
+                    value: "1",
+                    min: "0.1",
+                    max: "1",
+                    step: "0.1"
+                }),
+                h('label', {
+                    'for': 'width',
+                }),
+                h('span.selected')
+            ]),
+            setHTML(h('div#colors'), '&nbsp;'),
+            loadingScreen(),
+            h('div#cursors', {
+                style: {
+                    display: 'none',
+                    background: 'white',
+                    'text-align': 'center',
+                }
+            }),
+            h('div#pickers'),
+        ];
+    };
+
+    Pages['/poll/'] = Pages['/poll/index.html'] = function () {
+        return [
+            appToolbar(),
+            h('div#content', [
+                h('div#poll', [
+                    h('div#howItWorks', [
+                        h('h1', 'CryptPoll'),
+                        setHTML(h('h2'), Msg.poll_subtitle),
+                        h('p', Msg.poll_p_save),
+                        h('p', Msg.poll_p_encryption)
+                    ]),
+                    h('div.upper', [
+                        h('button#publish', {
+                            style: { display: 'none' }
+                        }, Msg.poll_publish_button),
+                        h('button#admin', {
+                            style: { display: 'none' },
+                            title: Msg.poll_admin_button
+                        }, Msg.poll_admin_button),
+                        h('button#help', {
+                            title: Msg.poll_show_help_button,
+                            style: { display: 'none' }
+                        }, Msg.poll_show_help_button)
+                    ]),
+                    h('div.realtime', [
+                        h('br'),
+                        h('center', [
+                            h('textarea#description', {
+                                rows: "5",
+                                cols: "50",
+                                disabled: true
+                            }),
+                            h('br')
+                        ]),
+                        h('div#tableContainer', [
+                            h('div#tableScroll'),
+                            h('button#create-user', {
+                                title: Msg.poll_create_user
+                            }, h('span.fa.fa-plus')),
+                            h('button#create-option', {
+                                title: Msg.poll_create_option
+                            }, h('span.fa.fa-plus')),
+                            h('button#commit', {
+                                title: Msg.poll_commit
+                            }, h('span.fa.fa-check'))
+                        ])
+                    ])
+                ])
+            ]),
+            loadingScreen()
+        ];
+    };
+
+    Pages['/drive/'] = Pages['/drive/index.html'] = function () {
+        return loadingScreen();
+    };
+
+    Pages['/file/'] = Pages['/file/index.html'] = function () {
+        return loadingScreen();
+    };
+
+    Pages['/contacts/'] = Pages['/contacts/index.html'] = function () {
+        return loadingScreen();
+    };
+
+    Pages['/pad/'] = Pages['/pad/index.html'] = function () {
+        return loadingScreen();
+    };
+
+    Pages['/code/'] = Pages['/code/index.html'] = function () {
+        return loadingScreen();
+    };
+
+    Pages['/slide/'] = Pages['/slide/index.html'] = function () {
+        return loadingScreen();
+    };
+
+    Pages['/invite/'] = Pages['/invite/index.html'] = function () {
+        return loadingScreen();
+    };
+
+    Pages['/settings/'] = Pages['/settings/index.html'] = function () {
+        return [
+            h('div#toolbar'),
+            h('div#container'),
+            loadingScreen()
+        ];
+    };
+
+    Pages['/profile/'] = Pages['/profile/index.html'] = function () {
+        return [
+            h('div#toolbar'),
+            h('div#container'),
+            loadingScreen()
+        ];
+    };
+
+    return Pages;
+});
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@ -1,79 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
-    <script src="/bower_components/requirejs/require.js"></script>
-    <script>
-        require.config({
-            waitSeconds: 60,
-        });
-    </script>
-        <!-- Piwik -->
-    <script type="text/javascript">
-      if (window.location.href.indexOf('cryptpad.fr') !== -1) {
-          // This piwik is only relevant to cryptpad.fr
-          var _paq = _paq || [];
-          _paq.push(['trackPageView']);
-          _paq.push(['enableLinkTracking']);
-          (function() {
-            var u="//piwik.xwiki.com/";
-            _paq.push(['setTrackerUrl', u+'piwik.php']);
-            _paq.push(['setSiteId', 12]);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-          })();
-      }
-    </script>
-    <!-- End Piwik Code -->
-
-
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
-<body>
-        <a href="https://github.com/xwiki-labs/cryptpad" class="github-corner" title="Star it, Fork it, or submit issues on Github!" target="_blank"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style><!-- Thanks! http://tholman.com/github-corners/ -->
-
-
-
-    <div id="main">
-    <center>
-        <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
-        <h1 data-localization="policy_title"></h1>
-    </center>
-
-    <h2 data-localization="policy_whatweknow"></h2>
-    <p data-localization="policy_whatweknow_p1"><!-- HTTP headers, IP address--></p>
-    <p data-localization="policy_whatweknow_p2"><!-- Piwik --></p>
-    <p>
-        <strong data-localization="policy_whatweknow_p3"><!-- Piwik disabled in pads --></strong>
-    </p>
-
-    <h2 data-localization="policy_howweuse"></h2>
-    <p data-localization="policy_howweuse_p1"><!-- Referrer : promoting--></p>
-    <p data-localization="policy_howweuse_p2"><!-- Browser : prioritizing new features--></p>
-
-    <h2 data-localization="policy_whatwetell"></h2>
-    <p data-localization="policy_whatwetell_p1"></p>
-
-    <h2 data-localization="policy_links"></h2>
-    <p data-localization="policy_links_p1"></p>
-
-    <h2 data-localization="policy_ads"></h2>
-    <p data-localization="policy_ads_p1"></p>
-
-    <h2 data-localization="policy_choices"></h2>
-    <p data-localization="policy_choices_open"></p>
-    <p data-localization="policy_choices_vpn"></p>
-    <p data-localization="policy_choices_ads"></p>
-
-    <br />
-
-
-
-
-    </div>
-</body>
+<body class="html">
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
 </html>
-
--- a/customize.dist/readme.md
+++ b/customize.dist/readme.md
@ -1,18 +1,25 @@
 # Customizing CryptPad

-In order allow the content of the main page to be changed and to allow site-specific changes
-to the pad and sheet while still keeping the git repository pristine, this directory exists
+In order allow a variety of features to be changed and to allow site-specific changes
+to CryptPad apps while still keeping the git repository pristine, this directory exists
 to allow a set of hooks to be run.

-The server is configured to check for a directory called `/customize/` and if that is not
-found, to fallback on `/customize.dist/`. In order to customize cryptpad, please **copy**
+The server is configured to load files from the `/customize/` path preferentially from
+`cryptpad/customize/`, and to fall back to `cryptpad/customize.dist/` if they are not found
+
+If you wish to customize cryptpad, please **copy**
 `/customize.dist/` to `/customize` and then edit it there, this way you will still be able
 to pull from (and make pull requests to (!) the git repository. 

+## Files you may be interested in

-* pad.js will be run whenever the (CKEditor) **pad** is loaded.
-* sheet.js will be run whenever the (JQuery.sheet) **spreadsheet** is loaded.
-* index.html is the main page.
+* index.html is the main page
+* main.js contains javascript for the home page
+* application_config.js allows you to modify settings used by the various applications
+* messages.js contains functions for applying translations to various pages
+  * look inside `/translations/` for the rest of the files which contain translated strings
+* `/share/` implements an iframe RPC which allows multiple domains to access the same localStorage
+* `/src/` contains source files for html and css (in the form of html templates and .less stylesheets)

 All other content which is placed in this directory will be referencable at the `/customize/`
 URL location.
--- a/customize.dist/share/frame.js
+++ b/customize.dist/share/frame.js
@ -10,7 +10,7 @@
    // create an invisible iframe with a given source
    // append it to a parent element
    // execute a callback when it has loaded
-    var create = Frame.create = function (parent, src, onload, timeout) {
+    Frame.create = function (parent, src, onload, timeout) {
        var iframe = document.createElement('iframe');

        timeout = timeout || 10000;
@ -18,19 +18,23 @@
            onload('[timeoutError] could not load iframe at ' + src);
        }, timeout);

+        iframe.setAttribute('id', 'cors-store');
+
        iframe.onload = function (e) {
            onload(void 0, iframe, e);
            window.clearTimeout(to);
        };
-        iframe.setAttribute('src', src);
-        iframe.style.display = 'none';
+        // We must pass a unique parameter here to avoid cache problems in Firefox with
+        // the NoScript plugin: if the iframe's content is taken from the cache, the JS
+        // is not executed with NoScript....
+        iframe.setAttribute('src', src + '?t=' + new Date().getTime());

        parent.appendChild(iframe);
    };

    /*  given an iframe with an rpc script loaded, create a frame object
        with an asynchronous 'send' method */
-    var open = Frame.open = function (e, A, timeout) {
+    Frame.open = function (e, A, timeout) {
        var win = e.contentWindow;

        var frame = {};
@ -40,7 +44,7 @@

        timeout = timeout || 5000;

-        var accepts = frame.accepts = function (o) {
+        frame.accepts = function (o) {
            return A.some(function (e) {
                 switch (typeof(e)) {
                    case 'string': return e === o;
@ -51,7 +55,7 @@

        var changeHandlers = frame.changeHandlers = [];

-        var change = frame.change = function (f) {
+        frame.change = function (f) {
            if (typeof(f) !== 'function') {
                throw new Error('[Frame.change] expected callback');
            }
@ -90,7 +94,7 @@
        };
        window.addEventListener('message', _listener);

-        var close = frame.close = function () {
+        frame.close = function () {
            window.removeEventListener('message', _listener);
        };

@ -126,31 +130,31 @@
            win.postMessage(JSON.stringify(req), '*');
        };

-        var set = frame.set = function (key, val, cb) {
+        frame.set = function (key, val, cb) {
            send('set', key, val, cb);
        };

-        var batchset = frame.setBatch = function (map, cb) {
+        frame.setBatch = function (map, cb) {
            send('batchset', void 0, map, cb);
        };

-        var get = frame.get = function (key, cb) {
+        frame.get = function (key, cb) {
            send('get', key, void 0, cb);
        };

-        var batchget = frame.getBatch = function (keys, cb) {
+        frame.getBatch = function (keys, cb) {
            send('batchget', void 0, keys, cb);
        };

-        var remove = frame.remove = function (key, cb) {
+        frame.remove = function (key, cb) {
            send('remove', key, void 0, cb);
        };

-        var batchremove = frame.removeBatch = function (keys, cb) {
+        frame.removeBatch = function (keys, cb) {
            send('batchremove', void 0, keys, cb);
        };

-        var keys = frame.keys = function (cb) {
+        frame.keys = function (cb) {
            send('keys', void 0, void 0, cb);
        };

@ -159,12 +163,8 @@

    if (typeof(module) !== 'undefined' && module.exports) {
        module.exports = Frame;
-    }
-    else if ((typeof(define) !== 'undefined' && define !== null) &&
-            (define.amd !== null)) {
-        define([
-            '/bower_components/jquery/dist/jquery.min.js',
-        ], function () {
+    } else if (typeof(define) === 'function' && define.amd) {
+        define(['jquery'], function () {
            return Frame;
        });
    } else {
--- a/customize.dist/share/test.js
+++ b/customize.dist/share/test.js
@ -1,8 +1,7 @@
 define([
-    '/customize/share/frame.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Frame) {
-    var $ = window.jQuery;
+    'jquery',
+    '/customize/share/frame.js'
+], function ($, Frame) {

    var domain = 'https://beta.cryptpad.fr';

@ -40,7 +39,7 @@ define([
        return !keys.some(function (k) { return data[k] !== null; });
    };

-    Frame.create(document.body, domain + path, function (err, iframe, loadEvent) {
+    Frame.create(document.body, domain + path, function (err, iframe) {
        if (handleErr(err)) { return; }
        console.log("Created iframe");

@ -51,7 +50,7 @@ define([

        [function (i) { // test #1
            var pew = randInt();
-            frame.set('pew', pew, function (err, data) {
+            frame.set('pew', pew, function (err) {
                if (handleErr(err)) { return; }
                frame.get('pew', function (err, num) {
                    if (handleErr(err)) { return; }
@ -77,9 +76,9 @@ define([

            var keys = Object.keys(map);

-            frame.setBatch(map, function (err, data) {
+            frame.setBatch(map, function (err) {
                if (handleErr(err)) { return; }
-                frame.getBatch(keys, function (err, data) {
+                frame.getBatch(keys, function (err) {
                    if (handleErr(err)) { return; }
                    frame.removeBatch(Object.keys(map), function (err) {
                        if (handleErr(err)) { return; }
@ -123,4 +122,3 @@ define([
        }].forEach(runTest);
    });
 });
-
--- a/customize.dist/sheet.js
+++ b/customize.dist/sheet.js
@ -1,9 +0,0 @@
-/*
-    globals require
-*/
-require([
-    '/customize/DecorateToolbar.js',
-    '/bower_components/jquery/dist/jquery.min.js'
-], function (Dt) {
-    Dt.main(window.$('#bottom-bar'));
-});
--- a/customize.dist/src/build.js
+++ b/customize.dist/src/build.js
@ -1,42 +0,0 @@
-var Fs = require("fs");
-
-// read a file
-var read = function (path) {
-    return Fs.readFileSync(path, 'utf-8');
-};
-
-// write a file
-var write = function (path, src) {
-    return Fs.writeFileSync(path, src);
-};
-
-// basic templating
-var swap = function (src, dict) {
-    return src.replace(/\{\{(.*?)\}\}/g, function (a, b) {
-        return dict[b] || b;
-    });
-};
-
-// read the template file
-var template = read('./template.html');
-
-// read page fragments
-var fragments = {};
-[   'analytics',
-    'index',
-    'fork',
-    'terms',
-    'privacy',
-].forEach(function (name) {
-    fragments[name] = read('./fragments/' + name + '.html');
-});
-
-// build static pages
-['index', 'privacy', 'terms'].forEach(function (page) {
-    var source = swap(template, {
-       fork: fragments.fork,
-       analytics: fragments.analytics,
-       main: fragments[page],
-    });
-    write('../' + page + '.html', source);
-});
--- a/customize.dist/src/cryptpad.less
+++ b/customize.dist/src/cryptpad.less
@ -1,647 +0,0 @@
-@import "./variables.less";
-
-.fontface(@family, @src, @style: normal, @weight: 400, @fmt: 'truetype'){
-    @font-face{
-        font-family: @family;
-        src: url(@src) format(@fmt);
-        font-weight: @weight;
-        font-style: @style;
-    }
-}
-
-a.github-corner > svg {
-    fill: @cp-green;
-    color: @base;
-}
-
-.transform(...) {
-    -webkit-transform: @arguments;
-    -moz-transform: @arguments;
-    -o-transform: @arguments;
-    -ms-transform: @arguments;
-    transform: @arguments;
-}
-
-.translate(@x:0, @y:0) {
-    .transform(translate(@x, @y));
-}
-
-.table-refresh > svg {
-    width: .9em;
-    height: .9em;
-    fill: @cp-green;
-    .translate(0, 15%);
-}
-
-.lato {
-    font-family: lato, Helvetica, sans-serif;
-    font-size: 1.02em;
-}
-
-html {
-    font-size: .875em;
-    background-color: @base;
-    color: @fore;
-}
-
-html,body {
-    font-family: Georgia,Cambria,serif;
-    height: 100%;
-}
-
-body {
-    font-size: 1rem;
-    font-weight: 400;
-    line-height: 2rem;
-}
-
-h1,h2,h3,h4,h5,h6 {
-    color: @fore;
-
-    font-family: "Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;
-    -webkit-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
-    -moz-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
-    font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
-    font-style: normal;
-    font-weight: 600;
-    margin-top: 0;
-}
-
-h1 {
-    line-height: 3rem;
-    font-size: 2.05714rem;
-    margin-bottom: .21999rem;
-    padding-top: .78001rem;
-}
-
-h2 {
-    font-size: 1.95312rem;
-    margin-bottom: .18358rem;
-    padding-top: .81642rem;
-}
-
-h2,h3 {
-    line-height: 3rem;
-}
-
-h3 {
-    font-size: 1.64571rem;
-    margin-bottom: .07599rem;
-    padding-top: .92401rem;
-}
-
-h4 {
-    font-size: 1.5625rem;
-    margin-bottom: .54686rem;
-    padding-top: .45314rem;
-}
-
-h5 {
-   font-size: 1.25rem;
-    margin-bottom: -.56251rem;
-    padding-top: .56251rem;
-}
-
-h6 {
-    font-size: 1rem;
-    margin-bottom: -.65001rem;
-    padding-top: .65001rem;
-}
-
-a {
-    cursor: pointer;
-    color: @cp-green;
-    text-decoration: none;
-
-    &:hover {
-        color: @cp-accent;
-    }
-}
-
-img {
-    height: auto;
-    max-width: 100%;
-
-    &.cryptofist {
-        filter: invert(100%);
-        -webkit-filter: invert(100%);
-    }
-}
-
-p {
-    padding-top: .66001rem;
-    margin-top: 0;
-}
-
-p,pre {
-    margin-bottom: 1.33999rem;
-}
-
-p, pre, td, a, table, tr {
-    .lato;
-}
-
-#main {
-    width: 70vw;
-    margin: auto;
-
-    font-size: medium;
-    padding-bottom: 1em;
-}
-
-/* buttons */
-.create, .action {
-    @thick: 2px;
-    border: @thick solid @cp-green;
-    border-radius: 10px;
-    background-color: @base;
-    color: @cp-green;
-
-    font-weight: bold;
-    font-size: large;
-    margin-right: 5px;
-    margin-left: 5px;
-    &:hover {
-        border: @thick solid @cp-accent;
-        color: @cp-green;
-    }
-}
-.create {
-    display: none;
-}
-.action {
-    display: inline-block;
-}
-.buttons {
-    margin-bottom: 50px;
-    margin-top: 20px;
-    line-height: 2.5em;
-}
-
-.button {
-    @hpad: 2 * 6px;
-    @vpad: 2 * 2px;
-    padding: @vpad @hpad @vpad @hpad;
-
-    border-radius: 5px;
-    margin-top: 2 * 6px;
-    margin-bottom: 2 * 6px;
-    white-space: nowrap;
-}
-.alertify button {
-    margin: 3px 0px;
-}
-/* Tables */
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-    margin: 20px;
-}
-tbody {
-    border: 2px solid black;
-    tr {
-        text-align: center;
-        &:first-of-type th{
-            font-size: 20px;
-            border-top: 0px;
-            font-weight: bold;
-            padding: 10px;
-            text-decoration: underline;
-            &.table-refresh {
-                color: @cp-green;
-                text-decoration: none;
-                cursor: pointer;
-            }
-
-        }
-        &:nth-child(odd) {
-            background-color: @light-base;
-        }
-        th:first-of-type {
-            border-left: 0px;
-        }
-        th {
-            box-sizing: border-box;
-            border: 1px solid black;
-        }
-        th, td {
-            color: @fore;
-
-            &.remove {
-                cursor: pointer;
-            }
-        }
-        th:last-child {
-            border-right: 0px;
-        }
-    }
-
-
-    td {
-        border-right: 1px solid black;
-        padding: 12px;
-        padding-top: 0px;
-        padding-bottom: 0px;
-        &:last-child {
-            border-right: none;
-        }
-    }
-}
-
-/* Bottom Bar */
-
-.top-bar, .bottom-bar {
-    position:fixed;
-    height:4%;
-    height: 2.5em;
-
-    display: inline-block;
-    width: 100%;
-    background: @base;
-    border-top: 1px solid @cp-outline;
-
-    a {
-        color: @cp-green;
-        text-decoration: none;
-    }
-    p {
-        margin: -1px;
-        font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
-
-        font-size: 20px;
-        display:block;
-        margin-left: 10px;
-        padding-top:3px;
-        color: @fore;
-    }
-    img {
-        margin-right: 4px;
-        position: relative;
-    }
-
-    .big {
-        @media screen and (max-width: 800px) {
-            display: none;
-        }
-        @media screen and (min-width: 801px) {
-            display: inline-block;
-        }
-    }
-    .small {
-        @media screen and (max-width: 800px) {
-            display: inline-block;
-        }
-        @media screen and (min-width: 801px) {
-            display: none;
-        }
-        img {
-            height: 1.25em;
-        }
-    }
-
-}
-.bottom-bar {
-    bottom: 0px;
-    right: 0px;
-}
-.top-bar {
-    top: 0px;
-    right: 0px;
-}
-
-.bottom-bar-left {
-    display:block;
-    float:left;
-    padding-left:10px;
-}
-.bottom-bar-left p {
-    float: right;
-}
-.bottom-bar-right {
-    display:block;
-    float:right;
-    padding-right:20px
-}
-.bottom-bar-center {
-    width: 20%;
-    position: absolute;
-    left: 40%;
-    text-align: center;
-}
-.bottom-bar-heart {
-    top: 2px;
-}
-.bottom-bar-xwiki {
-    top: 3px;
-}
-.bottom-bar-openpaas {
-    top: 3px;
-    max-width: 100px;
-}
-
-
-// form things
-
-// MIXINS
-.bottom-left(@s: 5px) { border-bottom-left-radius: @s; }
-.bottom-left {
-    .bottom-left;
-}
-
-.top-left(@s: 5px) { border-top-left-radius: @s; }
-.top-left {
-    .top-left;
-}
-
-.remove {
-    color: @cp-red;
-    cursor: pointer !important;
-}
-
-form.realtime {
-    > input {
-        &[type="text"] {
-
-        }
-    }
-    > textarea {
-        width: 50%;
-        height: 15vh;
-    }
-
-    padding: 0px;
-    margin: 0px;
-
-    table {
-        border-collapse: collapse;
-        tr {
-            td {
-                padding: 0px;
-                margin: 0px;
-
-                div.text-cell {
-                    padding: 0px;
-                    margin: 0px;
-                        height: 100%;
-                    input {
-                        width: 80%;
-                        height: 100%;
-                        border: 0px;
-                        &[disabled] {
-                            background-color: transparent;
-                            color: @fore;
-                            font-weight: bold;
-                        }
-                    }
-                }
-
-                &.checkbox-cell {
-                    margin: 0px;
-                    padding: 0px;
-
-                    div.checkbox-contain {
-                        display: block;
-                        height: 100%;
-                        width: 100%;
-                        position: relative;
-
-                        label {
-                            background-color: transparent;
-                            display: block;
-                            position: absolute;
-                            top: 0px;
-                            left: 0px;
-                            height: 100%;
-                            width: 100%;
-                        }
-
-                        input {
-                            &[type="checkbox"] {
-                                &:not(.editable) {
-                                    display: none;
-
-                                    ~ .cover {
-                                        display: block;
-                                        font-weight: bold;
-
-                                        background-color: @cp-red;
-                                        color: @base;
-                                        &:after { content: "✖"; }
-
-                                        display: block;
-                                        &.yes {
-                                            background-color: @cp-green;
-                                            &:after { content: "✔"; }
-                                        }
-                                        &.mine {
-                                            display: none;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        input {
-            &[type="text"] {
-                height: 100%;
-                width: 80%;
-                border: 3px solid @base;
-            }
-        }
-        .edit {
-            color: @cp-green;
-            cursor: pointer;
-            width: 10%;
-            font-size: 20px;
-            &:after { content: '✐'; }
-            &.editable { display: none; }
-        }
-
-        thead {
-            tr {
-                th {
-                    input[type="text"][disabled] {
-                        background-color: transparent;
-                        color: @fore;
-                        font-weight: bold;
-                    }
-                    .remove {
-                        cursor: pointer;
-                        font-size: 20px;
-                    }
-                }
-            }
-        }
-        tbody {
-            tr {
-                td {
-
-                }
-            }
-        }
-        tfoot {
-            tr {
-                td {
-                    text-align: center;
-                    .save {
-                        padding: 15px;
-                        border-top-left-radius: 5px;
-                        border-top-right-radius: 5px;
-                    }
-                }
-            }
-        }
-    }
-
-    #adduser,
-    #addoption {
-        color: @cp-green;
-        border: 1px solid @cp-green;
-        padding: 15px;
-        cursor: pointer;
-    }
-
-    #adduser { .top-left; }
-    #addoption { .bottom-left; }
-}
-
-.viewportRatio (@x, @y, @p: 100) {
-    width: @p * 100vw;
-    height: @y * (@p * 100vw) / @x;
-    max-width: @x / @y * (@p * 100vh);
-    max-height: (@p * 100vh);
-}
-
-div.modal, div#modal {
-
-    #content {
-        box-sizing: border-box;
-        .size (@n) {
-            font-size: @n * 1vw;
-            line-height: @n * 1.1vw;
-        }
-
-        border: 1px solid white;
-
-        vertical-align: middle;
-        padding: 2.5vw;
-
-
-        width: 100vw;
-        height: 56.25vw; // height:width ratio = 9/16 = .5625
-        //background: pink;
-        max-height: 100vh;
-        max-width: 177.78vh; // 16/9 = 1.778
-        margin: auto;
-        position: absolute;
-        top:0;bottom:0; // vertical center
-        left:0;right:0; // horizontal center
-
-        p, li, pre, code {
-            .size(2.75);
-        }
-
-        h1 { .size(5); }
-        h2 { .size(4.2); }
-        h3 { .size(3.6); }
-        h4 { .size (3); }
-        h5 { .size(2.2); }
-        h6 { .size(1.6); }
-
-
-        pre > code {
-
-            display: block;
-            position: relative;
-            border: 1px solid #333;
-            width: 90%;
-            margin: auto;
-            padding-left: .25vw;
-
-        }
-
-    }
-
-    box-sizing: border-box;
-    z-index: 9001;
-    position: fixed;
-
-    top: 0px;
-    left: 0px;
-
-    width: 100%;
-    height: 100vh;
-    display: none;
-
-    background-color: @base;
-
-    .center {
-        position: relative;
-
-        width: 80%;
-        height: 80%;
-        margin: auto;
-        border: 1px solid @light-base;
-
-        text-align: center;
-    }
-
-    &.shown {
-        display: block;
-    }
-
-    table {
-        margin: 30px;
-
-        border-collapse: collapse;
-        tr {
-            td {
-            }
-        }
-
-        input {
-            height: 100%;
-            width: 90%;
-            border: 3px solid @base;
-        }
-
-        thead {
-            tr {
-                th {
-                    span.remove {
-                    }
-                }
-            }
-        }
-        tbody {
-            tr {
-                td {
-
-                }
-            }
-        }
-        tfoot {
-            tr {
-                td {
-                    z-index: 4000;
-                    cursor: pointer;
-                }
-            }
-        }
-    }
-
-    #addtime,
-    #adddate {
-        color: @cp-green;
-        border: 1px solid @cp-green;
-        padding: 15px;
-    }
-
-    #adddate { .top-left; }
-    #addtime { .bottom-left; }
-}
--- a/customize.dist/src/fragments/analytics.html
+++ b/customize.dist/src/fragments/analytics.html
@ -1,18 +0,0 @@
-    <!-- Piwik -->
-    <script type="text/javascript">
-      if (window.location.href.indexOf('cryptpad.fr') !== -1) {
-          // This piwik is only relevant to cryptpad.fr
-          var _paq = _paq || [];
-          _paq.push(['trackPageView']);
-          _paq.push(['enableLinkTracking']);
-          (function() {
-            var u="//piwik.xwiki.com/";
-            _paq.push(['setTrackerUrl', u+'piwik.php']);
-            _paq.push(['setSiteId', 12]);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-          })();
-      }
-    </script>
-    <!-- End Piwik Code -->
-
--- a/customize.dist/src/fragments/fork.html
+++ b/customize.dist/src/fragments/fork.html
@ -1,2 +0,0 @@
-    <a href="https://github.com/xwiki-labs/cryptpad" class="github-corner" title="Star it, Fork it, or submit issues on Github!" target="_blank"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style><!-- Thanks! http://tholman.com/github-corners/ -->
-
--- a/customize.dist/src/fragments/index.html
+++ b/customize.dist/src/fragments/index.html
@ -1,51 +0,0 @@
-      <center>
-          <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
-          <h1>Unity is Strength - Collaboration is Key</h1>
-
-      </center>
-      <p data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
-
-      <p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p>
-
-      <h2 id="howitworks" data-localization="main_howitworks"></h2>
-      <p data-localization="main_howitworks_p1"><!-- Operational transform, Nakamoto blockchain, server kept unaware of the content--></p>
-
-      <h2 id="about-us" data-localization="main_about"></h2>
-
-      <p data-localization="main_about_p1"><!-- Privacy policy, terms of service --></p>
-      <p data-localization="main_about_p2"><!-- Contact us--></p>
-
-      <center>
-        <noscript>
-          <p>
-            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-          </p>
-          <hr>
-          <p>
-            <strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.
-          </p>
-        </noscript>
-        <h5 id="tryit" data-localization="tryIt"></h5>
-
-        <table class="recent scroll" style="display:none">
-            <tbody>
-
-            <tr>
-                <th data-localization="table_type"></th>
-                <th data-localization="table_link"></th>
-                <th data-localization="table_created"></th>
-                <th data-localization="table_last"></th>
-                <th></th>
-            </tr>
-
-            </tbody>
-        </table>
-
-        <div id="buttons" class="buttons">
-          <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a>
-          <a id="create-code" class="button create" href="/code/" data-localization="button_newcode"></a>
-          <a id="create-poll" class="button create" href="/poll/" data-localization="button_newpoll"></a>
-          <a id="create-slide" class="button create" href="/slide/" data-localization="button_newslide"></a>
-        </div>
-      </center>
-
--- a/customize.dist/src/fragments/privacy.html
+++ b/customize.dist/src/fragments/privacy.html
@ -1,34 +0,0 @@
-    <center>
-        <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
-        <h1 data-localization="policy_title"></h1>
-    </center>
-
-    <h2 data-localization="policy_whatweknow"></h2>
-    <p data-localization="policy_whatweknow_p1"><!-- HTTP headers, IP address--></p>
-    <p data-localization="policy_whatweknow_p2"><!-- Piwik --></p>
-    <p>
-        <strong data-localization="policy_whatweknow_p3"><!-- Piwik disabled in pads --></strong>
-    </p>
-
-    <h2 data-localization="policy_howweuse"></h2>
-    <p data-localization="policy_howweuse_p1"><!-- Referrer : promoting--></p>
-    <p data-localization="policy_howweuse_p2"><!-- Browser : prioritizing new features--></p>
-
-    <h2 data-localization="policy_whatwetell"></h2>
-    <p data-localization="policy_whatwetell_p1"></p>
-
-    <h2 data-localization="policy_links"></h2>
-    <p data-localization="policy_links_p1"></p>
-
-    <h2 data-localization="policy_ads"></h2>
-    <p data-localization="policy_ads_p1"></p>
-
-    <h2 data-localization="policy_choices"></h2>
-    <p data-localization="policy_choices_open"></p>
-    <p data-localization="policy_choices_vpn"></p>
-    <p data-localization="policy_choices_ads"></p>
-
-    <br />
-
-
-
--- a/customize.dist/src/fragments/terms.html
+++ b/customize.dist/src/fragments/terms.html
@ -1,11 +0,0 @@
-    <center>
-        <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
-        <h1 data-localization="tos_title"></h1>
-    </center>
-
-    <p data-localization="tos_legal"></p>
-    <p data-localization="tos_availability"></p>
-    <p data-localization="tos_e2ee"></p>
-    <p data-localization="tos_logs"></p>
-    <p data-localization="tos_3rdparties"></p>
-
--- a/customize.dist/src/less/alertify.less
+++ b/customize.dist/src/less/alertify.less
@ -1,9 +1,15 @@
@import "./variables.less";

+/*  Logs are shown to inform the user that something has happened
+    They are only displayed briefly
+*/
 .alertify-logs {
+    @media print {
+        visibility: hidden;
+    }
    > * {
        padding: @padding-base @padding-base * 4;
-        color: @fore;
+        color: @alertify-fore;

        font-weight: bold;
        font-size: large;
@ -27,6 +33,7 @@
 .alertify {
    position: fixed;
    background-color: @alertify-bg;
+    color: @alertify-fg;
    left: 0;
    right: 0;
    top: 0;
@ -54,10 +61,19 @@
    }

    .dialog, .alert {
+        .bright {
+            color: @light-base;
+        }

        & > div {
-            background-color: @light-base;
+            background-color: @alertify-dialog-bg;
            border-radius: 5px;
+            &.half {
+                width: 50%;
+                @media (max-width: @media-medium-screen) {
+                    width: 100%;
+                }
+            }
        }

        width: 100%;
@ -67,7 +83,8 @@
        transform: translateY(-50%);

        > * {
-            width: 400px;
+            width: 30%;
+            width: 500px;
            max-width: 95%;
            margin: 0 auto;
            text-align: center;
@ -125,15 +142,34 @@
                cursor: pointer;

                color: @alertify-btn-fg;
-                border: 1px solid @base;
+                border: 1px solid @alertify-base;
                border-radius: 5px;

+                &.safe, &.danger {
+                    color: @old-base;
+                    white-space: normal;
+                    font-weight: bold;
+                }
+                &.danger {
+                    background-color: @cp-red;
+                    &:hover, &:active {
+                        background-color: lighten(@cp-red, 5%);
+                    }
+                }
+
+                &.safe {
+                    background-color: @cp-green;
+                    &:hover, &:active {
+                        background-color: lighten(@cp-green, 10%);
+                    }
+                }
+
                &:hover, &:active {
                    background-color: @alertify-btn-bg-hover;
                }

                &:focus {
-                    border: 1px dotted @base;
+                    border: 1px dotted @alertify-base;
                }
                &::-moz-focus-inner {
                    border:0;
--- a/customize.dist/src/less/bar.less
+++ b/customize.dist/src/less/bar.less
@ -0,0 +1,91 @@
+/* Bottom Bar */
+
+.top-bar, .bottom-bar {
+    position:fixed;
+    height:4%;
+    height: 2.5em;
+
+    display: inline-block;
+    width: 100%;
+    background: @base;
+    border-top: 1px solid @cp-outline;
+
+    a {
+        color: @cp-green;
+        text-decoration: none;
+    }
+    p {
+        margin: -1px;
+        font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
+
+        font-size: 20px;
+        display:block;
+        margin-left: 10px;
+        padding-top:3px;
+        color: @fore;
+    }
+    img {
+        margin-right: 4px;
+        position: relative;
+    }
+
+    .big {
+        @media screen and (max-width: @media-not-big) {
+            display: none;
+        }
+        @media screen and (min-width: @media-not-small) {
+            display: inline-block;
+        }
+    }
+    .small {
+        @media screen and (max-width: @media-not-big) {
+            display: inline-block;
+        }
+        @media screen and (min-width: @media-not-small) {
+            display: none;
+        }
+        img {
+            height: 1.25em;
+        }
+    }
+
+}
+.bottom-bar {
+    bottom: 0px;
+    right: 0px;
+}
+.top-bar {
+    top: 0px;
+    right: 0px;
+}
+
+.bottom-bar-left {
+    display:block;
+    float:left;
+    padding-left:10px;
+}
+.bottom-bar-left p {
+    float: right;
+}
+.bottom-bar-right {
+    display:block;
+    float:right;
+    padding-right:20px
+}
+.bottom-bar-center {
+    width: 20%;
+    position: absolute;
+    left: 40%;
+    text-align: center;
+}
+.bottom-bar-heart {
+    top: 2px;
+}
+.bottom-bar-xwiki {
+    top: 3px;
+}
+.bottom-bar-openpaas {
+    top: 3px;
+    max-width: 100px;
+}
+
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@ -0,0 +1,675 @@
+@import "./variables.less";
+@import "./mixins.less";
+
+@import "./alertify.less";
+@import "./bar.less";
+@import "./loading.less";
+@import "./dropdown.less";
+@import "./topbar.less";
+@import "./footer.less";
+
+@toolbar-green: #5cb85c;
+
+html.cp, .cp body {
+    font-size: .875em;
+    background-color: @page-white; //@base;
+    color: @fore;
+
+    height: 100%;
+}
+.fa {
+    cursor: default; // Fix for Edge displaying the text cursor on every icon
+}
+
+.cp {
+
+// override bootstrap colors
+.btn-primary {
+    background-color: @cp-blue;
+    &:hover {
+        color: #fff;
+        background-color: #025aa5;
+        border-color: #01549b;
+    }
+}
+
+body {
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 2rem;
+    margin: 0;
+}
+
+a.github-corner > svg {
+    fill: @cp-blue;
+    color: @old-base;
+}
+
+.lato {
+    font-family: lato, Helvetica, sans-serif;
+    font-size: 1.02em;
+}
+
+.unselectable {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+h1,h2,h3,h4,h5,h6 {
+    color: @fore;
+
+    font-family: "Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;
+    -webkit-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
+    -moz-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
+    font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
+    font-style: normal;
+    font-weight: 600;
+    margin-top: 0;
+}
+
+h1 {
+    line-height: 3rem;
+    font-size: 2.05714rem;
+    margin-bottom: .21999rem;
+    padding-top: .78001rem;
+}
+
+h2 {
+    font-size: 1.95312rem;
+    margin-bottom: .18358rem;
+    padding-top: .81642rem;
+}
+
+h2,h3 {
+    line-height: 3rem;
+}
+
+h3 {
+    font-size: 1.64571rem;
+    margin-bottom: .07599rem;
+    padding-top: .92401rem;
+}
+
+h4 {
+    font-size: 1.5625rem;
+    margin-bottom: .54686rem;
+    padding-top: .45314rem;
+}
+
+h5 {
+   font-size: 1.25rem;
+    margin-bottom: -.56251rem;
+    padding-top: .56251rem;
+}
+
+h6 {
+    font-size: 1rem;
+    margin-bottom: -.65001rem;
+    padding-top: .65001rem;
+}
+
+p {
+    a:not(.btn) {
+        cursor: pointer;
+        color: @cp-link;
+
+        text-decoration: none;
+
+        &:hover {
+            color: @cp-link-hover;
+        }
+        &:visited {
+            color: @cp-link-visited;
+        }
+    }
+}
+a.btn {
+    font-family: sans-serif;
+}
+
+img {
+    height: auto;
+    max-width: 100%;
+}
+
+p {
+    padding-top: .66001rem;
+    margin-top: 0;
+}
+
+p,pre {
+    margin-bottom: 1.33999rem;
+}
+
+p, pre, td, a, table, tr {
+    .lato;
+}
+
+body.html {
+    display:flex;
+    flex-flow: column;
+}
+
+// Main page
+.page {
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+    background: @page-white;
+    padding: 10px 0;//@main-border-width;
+    position: relative;
+
+    .info-container {
+        color: #121212;
+        width: 800px;
+        max-width: 100%;
+        margin: 0 auto;
+        &>div{
+            padding: 10px;
+            width: 400px;
+            max-width: 100%;
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+            &:not(.image) {
+                @media screen and (max-width: @media-not-big) {
+                    width: 100%;
+                    left: 0;
+                }
+            }
+            &.image {
+                width:300px;
+                text-align: center;
+                @media screen and (max-width: @media-not-big) {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    &.first {
+        //margin-top: ~"min(calc(100vh - 150px), 650px)";
+        @media screen and (max-width: @media-not-big) {
+            //margin-top: 0;
+        }
+    }
+    &.even {
+        //background: darken(@base, 1%);
+    }
+    &.category {
+        background: @category-bg;
+    }
+
+    .app {
+        display: inline-block;
+        width: 300px;
+        vertical-align: middle;
+        margin: 0px 25px;
+        white-space: normal;
+        max-width: ~"calc(50% - 50px)";
+        @media screen and (max-width: 500px) {
+            display: block;
+            max-width: 100%;
+            margin: 0 auto;
+        }
+    }
+    .app-container {
+        width: 1400px;
+        max-width: 100%;
+        margin: 0 auto;
+    }
+    .app-row {
+        display: flex;
+        justify-content: center;
+        flex-flow: row wrap;
+        max-width: 100%;
+        margin: 0 auto;
+        @media screen and (max-width: 1399px) {
+            display: flex;
+        }
+        img {
+            @media screen and (max-width: @media-not-big) {
+                display: none;
+            }
+        }
+    }
+
+    .left {
+        //left: 10%; //@main-border-width;
+    }
+    .right {
+        left: 100px; //@main-border-width;
+    }
+
+    h1, h2, h3, h4, h5, h6 {
+        padding: 0;
+    }
+
+    @media screen and (max-width: @media-not-big) {
+        padding: 10px 5vh;
+    }
+
+    p {
+        font-size: 18px;
+        //text-align: justify;
+    }
+}
+
+.btn-default {
+    &:hover {
+        background-color: #d8d8d8;
+    }
+}
+
+#main {
+    .mainOverlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: #000;
+        opacity: 0.35;
+    }
+}
+noscript {
+    #noscriptContainer {
+        color: black;
+        position: absolute;
+        top: @topbar-height;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        z-index: 2;
+        #noscript {
+            width: 1000px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 100%;
+            margin-left: auto;
+            margin-right: auto;
+            position: relative;
+            font-size: 25px;
+            text-align: center;
+            color: @main-color;
+        }
+    }
+}
+#main {
+    background: @main-bg;
+    background-size: cover;
+    background-attachment: fixed;
+    background-position: center;
+    height: ~"calc(100vh - 115px)";
+    min-height: 450px;
+    .hidden {
+        display: none !important;
+    }
+}
+#main_other {
+    padding: 0 @main-border-width;
+    background-color: @page-white;
+}
+
+.category {
+    margin-top: 5px;
+}
+
+#mainBlock {
+    flex: 1;
+}
+
+#main, #main_other {
+    position: relative;
+    left: 0;
+    right: 0;
+    margin: auto;
+    z-index: 1;
+
+    font-size: medium;
+
+    #align-container {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        margin-left: auto;
+        margin-right: auto;
+        width: 1000px;
+        max-width: 90%;
+        position: relative;
+    }
+
+    #main-container {
+        display: inline-block;
+    }
+
+    #userForm .extra {
+        p {
+            font-size: 28px;
+            padding: 15px;
+            text-align: center;
+        }
+    }
+
+    #data {
+        p {
+            margin: 0;
+            padding: 0;
+            font-size: 28px;
+            line-height: 1.5em;
+            &.register-explanation {
+                font-size: 18px;
+            }
+        }
+        h1, h2 {
+            font-weight: normal;
+            font-size: 48px;
+            line-height: 1.2em;
+            color: @main-color;
+            padding: 0;
+        }
+
+        h5 {
+            font-size: 1em;
+            color: @main-color;
+        }
+        width: 600px;
+        max-width: 60%;
+        color: @main-color;
+        padding: 0 15px;
+        box-sizing: border-box;
+        display: inline-block;
+
+        #tryit {
+            margin-top: 20px;
+            margin-bottom: 5px;
+        }
+    }
+
+    #loggedIn {
+        float: right;
+        color: @main-color;
+        display: inline-block;
+        width: 350px;
+        max-width: 35%;
+        text-align: center;
+        font-weight: bold;
+        button {
+            font-weight: bold;
+            cursor: pointer;
+        }
+        p {
+            margin: 20px;
+            padding: 0;
+            font-size: 20px;
+            line-height: 1.5em;
+        }
+
+    }
+
+    #userForm {
+        float: right;
+        display: inline-block;
+        width: 400px;
+        max-width: 40%;
+        padding: 10px;
+        box-sizing: border-box;
+        font-family: lato, Helvetica, sans-serif;
+        color: @main-color;
+
+        label {
+            margin-bottom: 0;
+            margin-left: 5px;
+            vertical-align: middle;
+        }
+
+        button {
+            font-weight: bold;
+            width: 100%;
+            cursor: pointer;
+            &.half {
+                width: ~"calc(50% - 10px)";
+                &:not(.first) {
+                    float: right;
+                }
+            }
+        }
+
+        p {
+            margin: 0;
+            padding: 0;
+            &.buttons {
+                margin-bottom: 10px;
+                .dropdown-bar {
+                    button {
+                        white-space: normal;
+                        text-align: left;
+                        .fa {
+                            float: right;
+                        }
+                    }
+                    a {
+                        color: black;
+                        &:hover, :visited {
+                            color: black !important;
+                        }
+                    }
+                    display: block;
+                }
+            }
+            &.separator {
+                margin: 5px 0 15px 0;
+                text-align: center;
+                font-weight: bold;
+                font-size: 1.1em;
+            }
+            a {
+                color: @main-color;
+                font-weight:bold;
+                font-size: 14px;
+                &:hover, :visited {
+                    color: @main-color !important;
+                }
+            }
+        }
+
+        .driveLink {
+            padding-left: 1rem; //Bootstrap padding in buttons
+            font-size: 1em;
+        }
+
+        &> * {
+            margin-bottom: 10px;
+        }
+    }
+    @media screen and (max-width: @media-not-big) {
+        #align-container {
+            transform: initial;
+            position: relative;
+            display: block;
+            width: 90%;
+            left: 0;
+        }
+        #main-container {
+            position: relative;
+            transform: unset;
+            top:0;
+
+        }
+        #data {
+            text-align: center;
+        }
+        #userForm, #loggedIn, #data {
+            transform: initial;
+            position: relative;
+            display: block;
+            width: 100%;
+            max-width: 100%;
+            margin: 10px 0;
+            box-sizing: border-box;
+            float: none;
+        }
+        #userForm, #loggedIn {
+            //border: 1px solid #888;
+        }
+        position: relative;
+        height: auto;
+    }
+
+    .buttons {
+        margin-top: 15px;
+    }
+}
+
+/* buttons */
+
+.create, .action {
+    display: inline-block;
+    @thick: 2px;
+    border: 0;
+    background-color: @cp-darkblue;
+    color: @topbar-button-color;
+
+    font-weight: bold;
+    font-size: large;
+    margin-right: 5px;
+    margin-left: 5px;
+    &:hover {
+        color: darken(@topbar-button-color, 20%);
+    }
+}
+
+// currently only used in /user/
+.panel {
+    background-color: @dark-base;
+}
+
+/*  Tables
+ *  Currently only used by /poll/
+ */
+
+// form things
+.bottom-left {
+    .bottom-left;
+}
+
+.top-left {
+    .top-left;
+}
+
+.remove {
+    color: @cp-red;
+    cursor: pointer !important;
+}
+}
+
+/* Pin limit */
+.limit-container {
+    display: inline-flex;
+    flex-flow: column-reverse;
+    width: 100%;
+    margin-top: 20px;
+    .cryptpad-limit-bar {
+        display: inline-block;
+        max-width: 40vw;
+        margin: 3px;
+        box-sizing: border-box;
+        border: 1px solid #999;
+        background: white;
+        position: relative;
+        text-align: center;
+        vertical-align: middle;
+        width: ~"calc(100% - 6px)";
+        height: 25px;
+        line-height: 25px;
+        .usage {
+            height: 100%;
+            display: inline-block;
+            background: blue;
+            position: absolute;
+            left: 0;
+            z-index:1;
+            &.normal {
+                background: @toolbar-green;
+            }
+            &.warning {
+                background: orange;
+            }
+            &.above {
+                background: red;
+            }
+        }
+        .usageText {
+            position: relative;
+            color: black;
+            text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white;
+            z-index: 2;
+            font-size: @main-font-size;
+            font-weight: bold;
+        }
+    }
+    .upgrade {
+        padding: 0;
+        line-height: 25px;
+        height: 25px;
+        margin: 0 3px;
+        border-radius: 0;
+    }
+}
+
+/* Upload status table */
+#uploadStatusContainer {
+    position: absolute;
+    left: 10vw; right: 10vw;
+    bottom: 100px;
+    background-color: rgba(0,0,0,0.5);
+    color: white;
+    opacity: 0.7;
+    box-sizing: border-box;
+    z-index:10000;
+    display: none;
+    font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+    #uploadStatus {
+        width: 80vw;
+        border: 1px solid black;
+        border-collapse: collapse;
+        tr:nth-child(1) {
+            background-color: #888;
+            border: 1px solid #999;
+            td { text-align: center; }
+        }
+        td {
+            border-left: 1px solid #BBB;
+            border-right: 1px solid #BBB;
+            padding: 0 10px;
+        }
+        .upProgress {
+            width: 200px;
+            position: relative;
+            text-align: center;
+            box-sizing: border-box;
+        }
+        .progressContainer {
+            position: absolute;
+            width: 0px;
+            left: 5px;
+            top: 1px; bottom: 1px;
+            background-color: rgba(0,0,255,0.3);
+        }
+        .upCancel { text-align: center; }
+        .fa.cancel {
+            color: rgb(255, 0, 115);
+        }
+    }
+}
+
+// hack for our cross-origin iframe
+#cors-store {
+    display: none;
+}
--- a/customize.dist/src/less/dropdown.less
+++ b/customize.dist/src/less/dropdown.less
@ -0,0 +1,114 @@
+
+/* The container <div> - needed to position the dropdown content */
+.dropdown-bar {
+    position: relative;
+    display: inline-block;
+
+    .dropbtn {
+    }
+
+    &:hover {
+        .dropbtn {
+        }
+    }
+
+    .fa {
+        font-family: FontAwesome;
+    }
+
+    button {
+        .fa-caret-down{
+            margin-right: 0px;
+            margin-left: 5px;
+        }
+        * {
+            .unselectable();
+            cursor: default;
+        }
+    }
+
+    .dropdown-bar-content {
+        display: none;
+        position: absolute;
+        background-color: @dropdown-bg;
+        min-width: 250px;
+        box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
+        z-index: 1000;
+        max-height: 300px;
+        overflow-y: auto;
+        font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+        font-size: 16px;
+        line-height: 1em;
+
+        &.left {
+            right: 0;
+        }
+
+        &:hover {
+            display: block;
+        }
+
+        a {
+            color: @dropdown-color;
+            padding: 5px 16px;
+            text-decoration: none;
+            display: flex;
+            cursor: pointer;
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -ms-user-select: none;
+            user-select: none;
+            float: none;
+            text-align: left;
+            font: @dropdown-font;
+            line-height: 1em;
+
+
+            .fa {
+                width: 20px;
+                text-align: center;
+                margin-right: 5px !important;
+            }
+
+            &:hover {
+                background-color: @dropdown-bg-hover;
+                color: @dropdown-color;
+            }
+
+            &.active {
+                background-color: @dropdown-bg-active;
+                color: @dropdown-color;
+            }
+        }
+
+        hr {
+            margin: 5px 0px;
+            height: 1px;
+            background: #bbb;
+        }
+
+        p {
+            min-width: 160px;
+            padding: 5px;
+            margin: 0;
+            white-space: normal;
+            text-align: left;
+            color: black;
+            font-size: 14px;
+            * {
+                font-size: 14px;
+            }
+            h2 {
+                color: black;
+                font-weight: bold;
+                text-align: center;
+                background-color: #EEEEEE;
+                padding: 5px 0px;
+                margin: 5px 0px;
+                font-size: 16px;
+                white-space: normal;
+            }
+        }
+    }
+}
+
--- a/customize.dist/src/less/footer.less
+++ b/customize.dist/src/less/footer.less
@ -0,0 +1,29 @@
+@import "./variables.less";
+
+.cp footer {
+    background: @category-bg;
+    font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+    padding-top: 1em;
+    font-size: 1.2em;
+    a {
+        color: @cp-link;
+        &:visited {
+            color: @cp-link-visited;
+        }
+        &:hover {
+            color: @cp-link-hover;
+        }
+    }
+    li.title {
+        font-size: 1.2em;
+        font-weight: bold;
+    }
+    div.version-footer {
+        background-color: @old-base;
+        color: @old-fore;
+        text-align: center;
+        width: 100%;
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
+}
--- a/customize.dist/src/less/loading.less
+++ b/customize.dist/src/less/loading.less
@ -0,0 +1,58 @@
+@import "./variables.less";
+
+.cp #loading {
+    position: fixed;
+    z-index: 9999;
+    top: 0px;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+    background: @bg-loading;
+    color: @color-loading;
+    text-align: center;
+    font-size: 1.5em;
+    .loadingContainer {
+        margin-top: 50vh;
+        transform: translateY(-50%);
+    }
+    .cryptofist {
+        margin-left: auto;
+        margin-right: auto;
+        height: 300px;
+        @media screen and (max-height: @media-short-screen) {
+            display: none;
+        }
+    }
+    .spinnerContainer {
+        position: relative;
+        height: 100px;
+        > div {
+            height: 100px;
+        }
+    }
+}
+.cp #loadingTip {
+    position: fixed;
+    z-index: 99999;
+    top: 80%;
+    left: 0;
+    right: 0;
+    text-align: center;
+
+    transition: opacity 750ms;
+    transition-delay: 3000ms;
+    @media screen and (max-height: @media-medium-screen) {
+        display: none;
+    }
+    span {
+        background-color: @bg-loading;
+        color: @color-loading;
+        text-align: center;
+        font-size: 1.5em;
+        opacity: 0.7;
+        font-family: lato, Helvetica, sans-serif;
+        padding: 15px;
+        max-width: 60%;
+        display: inline-block;
+    }
+}
--- a/customize.dist/src/less/mixins.less
+++ b/customize.dist/src/less/mixins.less
@ -0,0 +1,140 @@
+@import "/customize/src/less/variables.less";
+
+.fontface(@family, @src, @style: normal, @weight: 400, @fmt: 'truetype'){
+    @font-face {
+        font-family: @family;
+        src: url(@src) format(@fmt);
+        font-weight: @weight;
+        font-style: @style;
+    }
+}
+
+.transform(...) {
+    -webkit-transform: @arguments;
+    -moz-transform: @arguments;
+    -o-transform: @arguments;
+    -ms-transform: @arguments;
+    transform: @arguments;
+}
+
+.translate(@x:0, @y:0) {
+    .transform(translate(@x, @y));
+}
+
+.bottom-left(@s: 5px) { border-bottom-left-radius: @s; }
+.top-left(@s: 5px) { border-top-left-radius: @s; }
+
+.size (@n) {
+    // font-size: @n * 1vmin;
+    // line-height: @n * 1.1vmin;
+    font-size: @n * 10%;
+    // line-height: @n * 11%;
+    line-height: 110%;
+}
+
+.two-part-gradient (@start, @end) {
+    background: -webkit-linear-gradient(@start, @end); /* For Safari 5.1 to 6.0 */
+    background: -o-linear-gradient(@start, @end); /* For Opera 11.1 to 12.0 */
+    background: -moz-linear-gradient(@start, @end); /* For Firefox 3.6 to 15 */
+    background: linear-gradient(@start, @end); /* Standard syntax */
+}
+
+.placeholderColor (@color) {
+    &::-webkit-input-placeholder { /* WebKit, Blink, Edge */
+        color: @color;;
+    }
+    &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+        color: @color;
+        opacity: 1;
+    }
+    &::-moz-placeholder { /* Mozilla Firefox 19+ */
+        color: @color;
+        opacity: 1;
+    }
+    &:-ms-input-placeholder { /* Internet Explorer 10-11 */
+        color: @color;
+    }
+    &::-ms-input-placeholder { /* Microsoft Edge */
+        color: @color;
+    }
+}
+
+.avatar (@width) {
+    &.avatar {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    &.clickable {
+        cursor: pointer;
+        &:hover {
+            background-color: rgba(0,0,0,0.3);
+        }
+    }
+    .default, media-tag {
+        display: inline-flex;
+        width: @width;
+        height: @width;
+        justify-content: center;
+        align-items: center;
+        border-radius: 4px;
+        overflow: hidden;
+        box-sizing: content-box;
+    }
+    .default {
+        .unselectable();
+        background: white;
+        color: black;
+        font-size: @width/1.2;
+    }
+    .right-col {
+        order: 10;
+        flex: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        display: flex;
+        flex-flow: column;
+        .name {
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .friend {
+            padding: 0;
+        }
+    }
+    media-tag {
+        min-height: @width;
+        min-width: @width;
+        max-height: @width;
+        max-width: @width;
+        img {
+            min-width: 100%;
+            min-height: 100%;
+            max-width: none;
+            max-height: none; // To override 'media-tag img' in slide.less
+        }
+    }
+    }
+}
+
+.leftsideCategory {
+    .unselectable();
+    padding: 5px 20px;
+    margin: 15px 0;
+    cursor: pointer;
+    height: @toolbar-line-height;
+    line-height: @toolbar-line-height - 10px;
+    .fa {
+        width: 25px;
+    }
+    &:hover {
+        background: rgba(0,0,0,0.05);
+    }
+    &.active {
+        background: white;
+    }
+}
--- a/customize.dist/src/less/sidebar-layout.less
+++ b/customize.dist/src/less/sidebar-layout.less
@ -0,0 +1,97 @@
+@import '/customize/src/less/variables.less';
+@import '/customize/src/less/mixins.less';
+
+@leftside-bg: #eee;
+@leftside-color: #000;
+@rightside-color: #000;
+@description-color: #777;
+
+@button-width: 400px;
+@button-bg: #3066e5;
+@button-alt-bg: #fff;
+@button-red-bg: #e54e4e;
+
+
+.cp {
+    input[type="text"] {
+        padding-left: 10px;
+    }
+    #container {
+        font-size: 16px;
+        display: flex;
+        flex: 1;
+        min-height: 0;
+        #leftSide {
+            color: @leftside-color;
+            width: 250px;
+            background: @leftside-bg;
+            display: flex;
+            flex-flow: column;
+            .categories {
+                flex: 1;
+                .category {
+                    .leftsideCategory();
+                }
+            }
+        }
+        #rightSide {
+            flex: 1;
+            padding: 5px 20px;
+            color: @rightside-color;
+            overflow: auto;
+            .element {
+                label:not(.noTitle), .label {
+                    display: block;
+                    font-weight: bold;
+                    margin-bottom: 0;
+                }
+                .description {
+                    display: block;
+                    color: @description-color;
+                    margin-bottom: 5px;
+                }
+                margin-bottom: 20px;
+            }
+            [type="text"], button {
+                vertical-align: middle;
+                height: 40px;
+                box-sizing: border-box;
+            }
+            .inputBlock {
+                display: inline-flex;
+                width: @button-width;
+                input {
+                    flex: 1;
+                    border-radius: 0.25em 0 0 0.25em;
+                    border: 1px solid #adadad;
+                    border-right: 0px;
+                }
+                button {
+                    border-radius: 0 0.25em 0.25em 0;
+                    //border: 1px solid #adadad;
+                    border-left: 0px;
+                }
+            }
+            button.btn {
+                background-color: @button-bg;
+                border-color: darken(@button-bg, 10%);
+                color: white;
+                &:hover {
+                    background-color: darken(@button-bg, 10%);
+                }
+                &.btn-danger {
+                    background-color: @button-red-bg;
+                    border-color: darken(@button-red-bg, 10%);
+                    color: white;
+                    &:hover {
+                        background-color: darken(@button-red-bg, 10%);
+                    }
+                }
+            }
+            &>div {
+                margin: 10px 0;
+            }
+        }
+    }
+}
+
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
--- a/customize.dist/src/less/topbar.less
+++ b/customize.dist/src/less/topbar.less
@ -0,0 +1,95 @@
+@import "./variables.less";
+
+#cryptpadTopBar {
+    background: @topbar-back;
+    position: relative;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: @topbar-height;
+    color: @topbar-color;
+    font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    padding: 5px;
+    box-sizing: border-box;
+    font-size: 30px;
+
+    border-bottom: 1px solid darken(@topbar-back, 15%);
+
+    &> span {
+        vertical-align: middle;
+        display: inline-block;
+        height: 100%;
+    }
+    .cryptpad-logo {
+        height: 40px;
+        vertical-align: middle;
+    }
+
+    .slogan {
+        font-size: 20px;
+        color: @topbar-color;
+        line-height: 40px;
+    }
+
+    .gotoMain {
+        color: @topbar-color;
+        height: 40px;
+        line-height: 40px;
+        &:hover {
+            text-decoration: none;
+            color: @cp-purple;
+        }
+    }
+
+    .right {
+        float: right;
+        font-size: 20px;
+        margin: 0px 10px;
+        line-height: 40px;
+
+        .buttonSuccess {
+            // Bootstrap 4 colors
+            color: #fff;
+            background: @toolbar-green;
+            border-color: @toolbar-green;
+            &:hover {
+                color: #fff;
+                background: #449d44;
+                border: 1px solid #419641;
+            }
+            span {
+                color: #fff;
+            }
+            .large {
+                margin-left: 5px;
+            }
+        }
+
+        button {
+            .buttonTitle {
+                .fa-user {
+                    margin-right: 5px;
+                }
+            }
+        }
+        &.link a {
+            font-weight: 500;
+            font-size: 0.75em;
+            color: @cp-link;
+
+            &:hover {
+                color: @cp-link-hover;
+                text-decoration: underline;
+            }
+            &:visited {
+                color: @cp-link-visited;
+            }
+        }
+
+        &.link {
+            @media screen and (max-width: @media-not-big) {
+                display: none;
+            }
+        }
+    }
+}
--- a/customize.dist/src/less/variables.less
+++ b/customize.dist/src/less/variables.less
@ -0,0 +1,139 @@
+@base: #fff; //#f5f5f5;
+@dark-base: darken(@base, 20%);
+@less-dark-base: darken(@base, 10%);
+@light-base: lighten(@base, 20%);
+@less-light-base: lighten(@base, 10%);
+@fore: #555;
+@old-base: #302B28;
+@old-fore: #fafafa;
+
+@main-font-size: 16px;
+
+@cp-green: #46E981;
+@cp-accent: lighten(@cp-green, 20%);
+
+//@cp-red: #FF0073; // remove red
+@cp-red: #FA5858; // remove red
+@cp-outline: #444;
+
+@cp-orange: #FE9A2E;
+
+@cp-blue: #00CFC1;
+@cp-blue: #00ADEE;
+@cp-light-blue: #41b7d8; // lighten(@cp-blue, 20%);
+
+@cp-purple: #558;
+
+@page-white: #fafafa;
+
+// links
+@cp-link: @cp-light-blue;
+@cp-link-visited: @cp-light-blue;
+@cp-link-hover: darken(@cp-light-blue, 10%);
+
+// alertify things
+
+@box-shadow: 0 2px 5px 0 rgba(0,0,0,.2);
+@padding-base: 12px;
+
+@success-color: @cp-green;
+@success-fore: @base;
+@danger-color: @cp-red;
+
+@text-color: rgba(0, 0, 0, .8);
+@border-radius: 1px;
+
+@alertify-fore: @old-fore;
+@alertify-base: @old-base;
+
+@alertify-dialog-bg: #444;
+@alertify-dialog-fg: @old-fore;
+
+@alertify-btn-fg: @old-fore;
+
+@alertify-btn-bg: rgba(200, 200, 200, 0.05);
+@alertify-btn-bg-hover: rgba(200, 200, 200, .15);
+
+@alertify-bg: rgba(0, 0, 0, .3);
+@alertify-fg: @old-fore;
+
+@alertify-input-bg: @old-base;
+@alertify-input-fg: @old-fore;
+
+@slide-default-bg: #000;
+
+@bg-loading: @old-base;
+@color-loading: @old-fore;
+
+@media-not-big: 800px;
+@media-not-small: 801px;
+
+@media-short-screen: 450px;
+@media-narrow-screen: 400px;
+@media-medium-screen: 600px;
+
+
+// Dropdown
+
+@dropdown-font: @main-font-size -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+@dropdown-bg: #f9f9f9;
+@dropdown-color: black;
+@dropdown-bg-hover: #f1f1f1;
+@dropdown-bg-active: #e8e8e8;
+
+// Toolbar
+
+@toolbar-button-font: @dropdown-font;
+
+@toolbar-pad-bg: #1c4fa0;
+@toolbar-pad-color: #fff;
+@toolbar-slide-bg: #e57614;
+@toolbar-slide-color: #fff;
+@toolbar-code-bg: #ffae00;
+@toolbar-code-color: #000;
+@toolbar-poll-bg: #006304;
+@toolbar-poll-color: #fff;
+@toolbar-whiteboard-bg: #800080;
+@toolbar-whiteboard-color: #fff;
+@toolbar-drive-bg: #0087ff;
+@toolbar-drive-color: #fff;
+@toolbar-file-bg: #cd2532;
+@toolbar-file-color: #fff;
+@toolbar-friends-bg: #607B8D;
+@toolbar-friends-color: #fff;
+@toolbar-default-bg: #ddd;
+@toolbar-default-color: #000;
+@toolbar-settings-bg: #0087ff;
+@toolbar-settings-color: #fff;
+@toolbar-profile-bg: #0087ff;
+@toolbar-profile-color: #fff;
+
+
+@topbar-back: #fff;
+@topbar-color: #000;
+@topbar-button-bg: #2E9AFE;
+@topbar-button-color: #fff;
+@topbar-height: 50px;
+
+@toolbar-top-height: 64px;
+
+@main-border-width: 15vw;
+@cp-darkblue: #3333ff;
+@cp-accent2: darken(@cp-darkblue, 20%);
+
+@main-block-bg: rgba(200, 200, 200, 0.3);
+@main-color: #fff;
+@main-bg: url('/customize/bg3.jpg') no-repeat center center;
+
+@category-bg: #f4f4f4;
+
+.unselectable () {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+@toolbar-line-height: 32px;
--- a/customize.dist/src/template.html
+++ b/customize.dist/src/template.html
@ -1,25 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
-    <script src="/bower_components/requirejs/require.js"></script>
-    <script>
-        require.config({
-            waitSeconds: 60,
-        });
-    </script>
-    {{analytics}}
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
-<body>
-    {{fork}}
-
-    <div id="main">
-{{main}}
-    </div>
-</body>
+<body class="html">
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
 </html>
-
--- a/customize.dist/src/toolbar.less
+++ b/customize.dist/src/toolbar.less
@ -1,315 +0,0 @@
-@import "./variables.less";
-
-.unselectable {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.cryptpad-toolbar {
-    box-sizing: border-box;
-
-    .unselectable;
-
-    font: normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
-    color: #000;
-    display: inline-block;
-    width: 100%;
-    z-index: 9001;
-
-    a {
-        float: right;
-    }
-
-    div {
-        white-space: normal;
-        &.cryptpad-back {
-            padding: 0;
-            font-weight: bold;
-            cursor: pointer;
-            color: #000;
-        }
-        &.cryptpad-lag {
-            float: left;
-            line-height: 26px;
-            margin: 2px 0px;
-        }
-    }
-
-    button, select, .rightside-element {
-        height: 26px;
-        padding-right: 5px;
-        padding-left: 5px;
-        margin: 2px;
-    }
-
-    button {
-        background-color: inherit;
-        background-image: linear-gradient(to bottom,#fff,#e4e4e4);
-        border: 1px solid #A6A6A6;
-        border-bottom-color: #979797;
-        border-radius: 3px;
-        &:hover {
-            background-image:linear-gradient(to bottom,#f2f2f2,#ccc);
-        }
-        &.userlist {
-            @media screen and (max-width: 800px) {
-                display: none;
-            }
-            @media screen and (min-width: 801px) {
-                display: inline-block;
-            }
-            &.small {
-                @media screen and (max-width: 800px) {
-                    display: inline-block;
-                }
-                @media screen and (min-width: 801px) {
-                    display: none;
-                }
-            }
-        }
-    }
-
-    .cryptpad-state {
-        line-height: 30px; /* equivalent to 26px + 2*2px margin used for buttons */
-    }
-
-    .rightside-button {
-        float: right;
-        cursor: pointer;
-    }
-
-    .leftside-button {
-        cursor: pointer;
-        float: left;
-    }
-
-    .rightside-element {
-        vertical-align: middle;
-        white-space: nowrap;
-        &.float {
-            float: right;
-        }
-    }
-
-    select {
-        border: 0px;
-        margin-left: 5px;
-        margin-right: 5px;
-        padding-left: 5px;
-        border: 1px solid #A6A6A6;
-        border-bottom-color: #979797;
-    }
-}
-
-.cryptpad-toolbar-top {
-    display: block;
-    text-align: center;
-    height: 32px;
-    position: relative;
-    @media screen and (max-width: 400px) {
-        height: 67px;
-    }
-    .cryptpad-title {
-        .title, .pencilIcon {
-            font-size: 1.5em;
-            vertical-align: middle;
-            line-height: 32px;
-        }
-        .pencilIcon {
-            display: none;
-            &:hover {
-                color: #999;
-            }
-            span {
-                cursor: pointer;
-            }
-        }
-        &:not(input):hover {
-            .editable {
-                border: 1px solid #888;
-                border-radius: 2px 0px 0px 2px;
-                background: white;
-                padding: 5px;
-                border-collapse: collapse;
-            }
-            .pencilIcon {
-                cursor: pointer;
-                border: 1px solid #888;
-                border-radius: 0px 2px 2px 0px;
-                background: white;
-                padding: 5px;
-                display: inline;
-                margin-left: -1px;
-                border-collapse: collapse;
-            }
-        }
-        input {
-            font-size: 1.5em;
-            vertical-align: middle;
-            height: 100%;
-            box-sizing: border-box;
-            border: 1px solid black;
-            background: #fff;
-            cursor: auto;
-            width: 300px;
-            padding: 0px 5px;
-        }
-    }
-    .cryptpad-link {
-        position: absolute;
-        left: 0px;
-        height: 32px;
-        @media screen and (max-width: 400px) {
-            top: 35px;
-        }
-        @media screen and (min-width: 401px) {
-            top: 0px;
-        }
-
-        a.cryptpad-logo {
-            cursor: pointer;
-            height: 32px;
-            padding: 0px 5px;
-            text-decoration: none;
-            color: inherit;
-            &:hover {
-                span {
-                    text-decoration: underline;
-                }
-            }
-            img {
-                vertical-align: middle;
-                height: 32px;
-                cursor: pointer;
-            }
-            span {
-                font-size: 1.5em;
-                margin-left: 5px;
-                vertical-align: middle;
-                cursor: pointer;
-            }
-        }
-        .big {
-            @media screen and (max-width: 400px) {
-                display: none;
-            }
-            @media screen and (min-width: 401px) {
-                display: inline-block;
-            }
-        }
-        .small {
-            @media screen and (max-width: 400px) {
-                display: inline-block;
-            }
-            @media screen and (min-width: 401px) {
-                display: none;
-            }
-        }
-    }
-    .cryptpad-user {
-        position: absolute;
-        right: 0;
-        @media screen and (max-width: 400px) {
-            top: 3em;
-        }
-        @media screen and (min-width: 401px) {
-            top: 0px;
-        }
-    }
-}
-.cryptpad-toolbar-leftside {
-    float: left;
-    margin-bottom: -1px;
-    .cryptpad-user-list {
-        float: right;
-    }
-    .cryptpad-dropdown-container {
-        position: relative;
-        display: inline-block;
-        padding: 0px;
-        .cryptpad-dropdown {
-            z-index:1000;
-            display:none;
-            position: absolute;
-            background-color: #f9f9f9;
-            min-width: 160px;
-            overflow: auto;
-            box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-            height: auto;
-            padding: 5px;
-            white-space: normal;
-            p {
-                width: 210px;
-                padding: 0;
-                margin: 0;
-                white-space: normal;
-                &.cryptpad-dropdown-users {
-                    text-align:baseline;
-                    .yourself, .anonymous, .viewer {
-                        font-style: italic;
-                    }
-                }
-                h2 {
-                    font-weight: bold;
-                    text-align: center;
-                    background-color: #EEEEEE;
-                    padding: 5px 0px;
-                    margin: 5px 0px;
-                    font-size: 16px;
-                }
-            }
-            button {
-                margin: 2px 0px;
-            }
-        }
-    }
-    button {
-        margin: 2px 4px 2px 0px;
-    }
-    .cryptpad-userbuttons-container {
-        display: none;
-    }
-}
-.cryptpad-toolbar-rightside {
-    text-align: right;
-    //float: right;
-}
-.cryptpad-spinner {
-    float: left;
-    display: inline-block;
-    height: 26px;
-    margin: 2px;
-    line-height: 26px;
-    font-size: 20px;
-}
-.cryptpad-readonly {
-    margin-right: 5px;
-    font-weight: bold;
-    text-transform: uppercase;
-}
-.cryptpad-toolbar-username {
-}
-.lag {
-    display: inline-block;
-    vertical-align: middle;
-    padding: 0 !important;
-    margin: 0 5px !important;
-    height: 15px !important;
-    width: 15px !important;
-    border-radius: 50%;
-    border: 1px solid @cp-outline;
-}
-.lag-green {
-    background-color: @cp-green;
-}
-.lag-red {
-    background-color: @cp-red;
-}
-.lag-orange {
-    background-color: @cp-orange;
-}
-
--- a/customize.dist/src/variables.less
+++ b/customize.dist/src/variables.less
@ -1,33 +0,0 @@
-@base: #302B28;
-@light-base: lighten(@base, 20%);
-@fore: #fafafa;
-
-@cp-green: #46E981;
-@cp-accent: lighten(@cp-green, 20%);
-
-@cp-red: #FF0073; // remove red
-@cp-outline: #444;
-
-@cp-orange: #FE9A2E;
-// alertify things
-
-@box-shadow: 0 2px 5px 0 rgba(0,0,0,.2);
-@padding-base: 12px;
-
-@success-color: @cp-green;
-@success-fore: @base;
-@danger-color: @cp-red;
-
-@text-color: rgba(0, 0, 0, .8);
-@border-radius: 1px;
-
-@alertify-btn-fg: @fore;
-
-@alertify-btn-bg: transparent;
-@alertify-btn-bg-hover: rgba(0, 0, 0, .15);
-
-@alertify-bg: rgba(0, 0, 0, .3);
-
-@alertify-input-bg: @base;
-@alertify-input-fg: @fore;
-
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@ -0,0 +1,198 @@
+define([
+    'jquery',
+    '/common/hyperscript.js',
+    '/common/cryptpad-common.js',
+    '/customize/pages.js',
+    '/api/config',
+
+    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+], function ($, h, Cryptpad, Pages, Config) {
+$(function () {
+    var urlArgs = Config.requireConf.urlArgs;
+    var Messages = Cryptpad.Messages;
+    var $body = $('body');
+    var isMainApp = function () {
+        return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|drive|settings|profile)\/$/.test(location.pathname);
+    };
+
+    var rightLink = function (ref, loc, txt) {
+        return h('span.link.right', [
+            h('a', { href: ref, 'data-localization': loc}, txt)
+        ]);
+    };
+
+    var $topbar = $(h('div#cryptpadTopBar', [
+        h('span', [
+            h('a.gotoMain', {href: '/'}, [
+                h('img.cryptpad-logo', {
+                    src: '/customize/cryptofist_mini.png?' + urlArgs,
+                    alt: '',
+                }),
+                'CryptPad'
+            ])
+        ]),
+        h('span#user-menu.right.dropdown-bar'),
+        h('span#language-selector.right.dropdown-bar'),
+
+        rightLink('/about.html', 'about', 'About'),
+        rightLink('/privacy.html', 'privacy', 'Privacy'),
+        rightLink('/terms.html', 'terms', 'ToS'),
+        rightLink('/contact.html', 'contact', 'Contact'),
+        rightLink('https://blog.cryptpad.fr/', 'blog', 'Blog'),
+        h('span.link.right', [
+            h('button#upgrade.upgrade.btn.buttonSuccess', {
+                style: { display: 'none' }
+            })
+        ])
+        ]
+    ));
+
+    var infoPage = function () {
+        return h('div#mainBlock.hidden', typeof(Pages[location.pathname]) === 'function'?
+            Pages[location.pathname](): [h('div#container')]);
+    };
+
+    var $main = $(infoPage());
+
+    var footerCol = function (title, L, literal) {
+        return h('div.col', [
+            h('ul.list-unstyled', [
+                h('li.title', {
+                    'data-localization': title,
+                }, title? Messages[title]: literal )
+                ].concat(L.map(function (l) {
+                    return h('li', [ l ]);
+                }))
+            )
+        ]);
+    };
+
+    var footLink = function (ref, loc, text) {
+        var attrs =  {
+            href: ref,
+        };
+        if (!/^\//.test(ref)) {
+            attrs.target = '_blank';
+            attrs.rel = 'noopener noreferrer';
+        }
+        if (loc) {
+            attrs['data-localization'] =  loc;
+            text = Messages[loc];
+        }
+        return h('a', attrs, text);
+    };
+
+    var $footer = $(h('footer', [
+        h('div.container', [
+            h('div.row', [
+                footerCol(null, [
+                    footLink('/about.html', 'about'),
+                    footLink('/terms.html', 'terms'),
+                    footLink('/privacy.html', 'privacy'),
+                ], 'CryptPad'),
+                footerCol('footer_applications', [
+                    footLink('/drive/', 'main_drive'),
+                    footLink('/pad/', 'main_richText'),
+                    footLink('/code/', 'main_code'),
+                    footLink('/slide/', 'main_slide'),
+                    footLink('/poll/', 'main_poll'),
+                    footLink('/whiteboard/', null, Messages.type.whiteboard)
+                ]),
+                footerCol('footer_aboutUs', [
+                    footLink('https://blog.cryptpad.fr', 'blog'),
+                    footLink('https://labs.xwiki.com', null, 'XWiki Labs'),
+                    footLink('http://www.xwiki.com', null, 'XWiki SAS'),
+                    footLink('https://www.open-paas.org', null, 'OpenPaaS')
+                ]),
+                footerCol('footer_contact', [
+                    footLink('https://riot.im/app/#/room/#cryptpad:matrix.org', null, 'Chat'),
+                    footLink('https://twitter.com/cryptpad', null, 'Twitter'),
+                    footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub'),
+                    footLink('/contact.html', null, 'Email')
+                ])
+            ])
+        ]),
+        h('div.version-footer', "CryptPad v1.11.0 (Lutin)")
+    ]));
+
+    var pathname = location.pathname;
+
+    if (isMainApp()) {
+        if (typeof(Pages[pathname]) === 'function') {
+            var $flash = $('body, #iframe-container, #pad-iframe, textarea');
+            $flash.css({
+                display: 'none',
+                opacity: 0,
+                overflow: 'hidden',
+            });
+            var ready = function () {
+                $flash.css({
+                    display: '',
+                    opacity: '',
+                    overflow: '',
+                });
+            };
+
+            require([
+                'less!/customize/src/less/loading.less'
+            ], function () {
+                if (/whiteboard/.test(pathname)) {
+                    $('body').html(h('body', Pages[pathname]()).innerHTML);
+                    require(['/whiteboard/main.js'], ready);
+                } else if (/poll/.test(pathname)) {
+                    $('body').html(h('body', Pages[pathname]()).innerHTML);
+                    require(['/poll/main.js'], ready);
+                } else if (/drive/.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require(['/drive/main.js'], ready);
+                } else if (/\/file\//.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require([ '/file/main.js' ], ready);
+                } else if (/contacts/.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require([ '/contacts/main.js' ], ready);
+                } else if (/pad/.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require([ '/pad/main.js' ], ready);
+                } else if (/code/.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require([ '/code/main.js' ], ready);
+                } else if (/slide/.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require([ '/slide/main.js' ], ready);
+                } else if (/^\/settings\//.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require([ '/settings/main.js', ], ready);
+                } else if (/^\/profile\//.test(pathname)) {
+                    $('body').append(h('body', Pages[pathname]()).innerHTML);
+                    require([ '/profile/main.js', ], ready);
+                }
+            });
+
+            return;
+        }
+    }
+
+    require([
+        'less!/customize/src/less/cryptpad.less',
+        'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+    ], function () {
+        $body.append($topbar).append($main).append($footer);
+
+        if (/^\/user\//.test(pathname)) {
+            require([ '/user/main.js'], function () {});
+        } else if (/^\/register\//.test(pathname)) {
+            require([ '/register/main.js' ], function () {});
+        } else if (/^\/login\//.test(pathname)) {
+            require([ '/login/main.js' ], function () {});
+        } else if (/^\/($|^\/index\.html$)/.test(pathname)) {
+            // TODO use different top bar
+            require([ '/customize/main.js', ], function () {});
+        } else if (/invite/.test(pathname)) {
+            require([ '/invite/main.js'], function () {});
+        } else {
+            require([ '/customize/main.js', ], function () {});
+        }
+    });
+});
+});
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@ -1,56 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
-    <script src="/bower_components/requirejs/require.js"></script>
-    <script>
-        require.config({
-            waitSeconds: 60,
-        });
-    </script>
-        <!-- Piwik -->
-    <script type="text/javascript">
-      if (window.location.href.indexOf('cryptpad.fr') !== -1) {
-          // This piwik is only relevant to cryptpad.fr
-          var _paq = _paq || [];
-          _paq.push(['trackPageView']);
-          _paq.push(['enableLinkTracking']);
-          (function() {
-            var u="//piwik.xwiki.com/";
-            _paq.push(['setTrackerUrl', u+'piwik.php']);
-            _paq.push(['setSiteId', 12]);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-          })();
-      }
-    </script>
-    <!-- End Piwik Code -->
-
-
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
-<body>
-        <a href="https://github.com/xwiki-labs/cryptpad" class="github-corner" title="Star it, Fork it, or submit issues on Github!" target="_blank"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style><!-- Thanks! http://tholman.com/github-corners/ -->
-
-
-
-    <div id="main">
-    <center>
-        <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
-        <h1 data-localization="tos_title"></h1>
-    </center>
-
-    <p data-localization="tos_legal"></p>
-    <p data-localization="tos_availability"></p>
-    <p data-localization="tos_e2ee"></p>
-    <p data-localization="tos_logs"></p>
-    <p data-localization="tos_3rdparties"></p>
-
-
-    </div>
-</body>
+<body class="html">
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
 </html>
-
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@ -1,318 +0,0 @@
-.unselectable {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.cryptpad-toolbar {
-  box-sizing: border-box;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
-  color: #000;
-  display: inline-block;
-  width: 100%;
-  z-index: 9001;
-}
-.cryptpad-toolbar a {
-  float: right;
-}
-.cryptpad-toolbar div {
-  white-space: normal;
-}
-.cryptpad-toolbar div.cryptpad-back {
-  padding: 0;
-  font-weight: bold;
-  cursor: pointer;
-  color: #000;
-}
-.cryptpad-toolbar div.cryptpad-lag {
-  float: left;
-  line-height: 26px;
-  margin: 2px 0px;
-}
-.cryptpad-toolbar button,
-.cryptpad-toolbar select,
-.cryptpad-toolbar .rightside-element {
-  height: 26px;
-  padding-right: 5px;
-  padding-left: 5px;
-  margin: 2px;
-}
-.cryptpad-toolbar button {
-  background-color: inherit;
-  background-image: linear-gradient(to bottom, #fff, #e4e4e4);
-  border: 1px solid #A6A6A6;
-  border-bottom-color: #979797;
-  border-radius: 3px;
-}
-.cryptpad-toolbar button:hover {
-  background-image: linear-gradient(to bottom, #f2f2f2, #ccc);
-}
-@media screen and (max-width: 800px) {
-  .cryptpad-toolbar button.userlist {
-    display: none;
-  }
-}
-@media screen and (min-width: 801px) {
-  .cryptpad-toolbar button.userlist {
-    display: inline-block;
-  }
-}
-@media screen and (max-width: 800px) {
-  .cryptpad-toolbar button.userlist.small {
-    display: inline-block;
-  }
-}
-@media screen and (min-width: 801px) {
-  .cryptpad-toolbar button.userlist.small {
-    display: none;
-  }
-}
-.cryptpad-toolbar .cryptpad-state {
-  line-height: 30px;
-  /* equivalent to 26px + 2*2px margin used for buttons */
-}
-.cryptpad-toolbar .rightside-button {
-  float: right;
-  cursor: pointer;
-}
-.cryptpad-toolbar .leftside-button {
-  cursor: pointer;
-  float: left;
-}
-.cryptpad-toolbar .rightside-element {
-  vertical-align: middle;
-  white-space: nowrap;
-}
-.cryptpad-toolbar .rightside-element.float {
-  float: right;
-}
-.cryptpad-toolbar select {
-  border: 0px;
-  margin-left: 5px;
-  margin-right: 5px;
-  padding-left: 5px;
-  border: 1px solid #A6A6A6;
-  border-bottom-color: #979797;
-}
-.cryptpad-toolbar-top {
-  display: block;
-  text-align: center;
-  height: 32px;
-  position: relative;
-}
-@media screen and (max-width: 400px) {
-  .cryptpad-toolbar-top {
-    height: 67px;
-  }
-}
-.cryptpad-toolbar-top .cryptpad-title .title,
-.cryptpad-toolbar-top .cryptpad-title .pencilIcon {
-  font-size: 1.5em;
-  vertical-align: middle;
-  line-height: 32px;
-}
-.cryptpad-toolbar-top .cryptpad-title .pencilIcon {
-  display: none;
-}
-.cryptpad-toolbar-top .cryptpad-title .pencilIcon:hover {
-  color: #999;
-}
-.cryptpad-toolbar-top .cryptpad-title .pencilIcon span {
-  cursor: pointer;
-}
-.cryptpad-toolbar-top .cryptpad-title:not(input):hover .editable {
-  border: 1px solid #888;
-  border-radius: 2px 0px 0px 2px;
-  background: white;
-  padding: 5px;
-  border-collapse: collapse;
-}
-.cryptpad-toolbar-top .cryptpad-title:not(input):hover .pencilIcon {
-  cursor: pointer;
-  border: 1px solid #888;
-  border-radius: 0px 2px 2px 0px;
-  background: white;
-  padding: 5px;
-  display: inline;
-  margin-left: -1px;
-  border-collapse: collapse;
-}
-.cryptpad-toolbar-top .cryptpad-title input {
-  font-size: 1.5em;
-  vertical-align: middle;
-  height: 100%;
-  box-sizing: border-box;
-  border: 1px solid black;
-  background: #fff;
-  cursor: auto;
-  width: 300px;
-  padding: 0px 5px;
-}
-.cryptpad-toolbar-top .cryptpad-link {
-  position: absolute;
-  left: 0px;
-  height: 32px;
-}
-@media screen and (max-width: 400px) {
-  .cryptpad-toolbar-top .cryptpad-link {
-    top: 35px;
-  }
-}
-@media screen and (min-width: 401px) {
-  .cryptpad-toolbar-top .cryptpad-link {
-    top: 0px;
-  }
-}
-.cryptpad-toolbar-top .cryptpad-link a.cryptpad-logo {
-  cursor: pointer;
-  height: 32px;
-  padding: 0px 5px;
-  text-decoration: none;
-  color: inherit;
-}
-.cryptpad-toolbar-top .cryptpad-link a.cryptpad-logo:hover span {
-  text-decoration: underline;
-}
-.cryptpad-toolbar-top .cryptpad-link a.cryptpad-logo img {
-  vertical-align: middle;
-  height: 32px;
-  cursor: pointer;
-}
-.cryptpad-toolbar-top .cryptpad-link a.cryptpad-logo span {
-  font-size: 1.5em;
-  margin-left: 5px;
-  vertical-align: middle;
-  cursor: pointer;
-}
-@media screen and (max-width: 400px) {
-  .cryptpad-toolbar-top .cryptpad-link .big {
-    display: none;
-  }
-}
-@media screen and (min-width: 401px) {
-  .cryptpad-toolbar-top .cryptpad-link .big {
-    display: inline-block;
-  }
-}
-@media screen and (max-width: 400px) {
-  .cryptpad-toolbar-top .cryptpad-link .small {
-    display: inline-block;
-  }
-}
-@media screen and (min-width: 401px) {
-  .cryptpad-toolbar-top .cryptpad-link .small {
-    display: none;
-  }
-}
-.cryptpad-toolbar-top .cryptpad-user {
-  position: absolute;
-  right: 0;
-}
-@media screen and (max-width: 400px) {
-  .cryptpad-toolbar-top .cryptpad-user {
-    top: 3em;
-  }
-}
-@media screen and (min-width: 401px) {
-  .cryptpad-toolbar-top .cryptpad-user {
-    top: 0px;
-  }
-}
-.cryptpad-toolbar-leftside {
-  float: left;
-  margin-bottom: -1px;
-}
-.cryptpad-toolbar-leftside .cryptpad-user-list {
-  float: right;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container {
-  position: relative;
-  display: inline-block;
-  padding: 0px;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown {
-  z-index: 1000;
-  display: none;
-  position: absolute;
-  background-color: #f9f9f9;
-  min-width: 160px;
-  overflow: auto;
-  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
-  height: auto;
-  padding: 5px;
-  white-space: normal;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown p {
-  width: 210px;
-  padding: 0;
-  margin: 0;
-  white-space: normal;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown p.cryptpad-dropdown-users {
-  text-align: baseline;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown p.cryptpad-dropdown-users .yourself,
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown p.cryptpad-dropdown-users .anonymous,
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown p.cryptpad-dropdown-users .viewer {
-  font-style: italic;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown p h2 {
-  font-weight: bold;
-  text-align: center;
-  background-color: #EEEEEE;
-  padding: 5px 0px;
-  margin: 5px 0px;
-  font-size: 16px;
-}
-.cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown button {
-  margin: 2px 0px;
-}
-.cryptpad-toolbar-leftside button {
-  margin: 2px 4px 2px 0px;
-}
-.cryptpad-toolbar-leftside .cryptpad-userbuttons-container {
-  display: none;
-}
-.cryptpad-toolbar-rightside {
-  text-align: right;
-}
-.cryptpad-spinner {
-  float: left;
-  display: inline-block;
-  height: 26px;
-  margin: 2px;
-  line-height: 26px;
-  font-size: 20px;
-}
-.cryptpad-readonly {
-  margin-right: 5px;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-.lag {
-  display: inline-block;
-  vertical-align: middle;
-  padding: 0 !important;
-  margin: 0 5px !important;
-  height: 15px !important;
-  width: 15px !important;
-  border-radius: 50%;
-  border: 1px solid #444;
-}
-.lag-green {
-  background-color: #46E981;
-}
-.lag-red {
-  background-color: #FF0073;
-}
-.lag-orange {
-  background-color: #FE9A2E;
-}
--- a/customize.dist/translations/README.md
+++ b/customize.dist/translations/README.md
@ -20,63 +20,51 @@ To include your translation in the list, you'll need to add it to `/customize.di
 There are comments indicating what to modify in three places:

 ```javascript
-define(['/customize/languageSelector.js',
-        '/customize/translations/messages.js',
-        '/customize/translations/messages.es.js',
-        '/customize/translations/messages.fr.js',
+(function () {
+var LS_LANG = "CRYPTPAD_LANG";

-    // 1) additional translation files can be added here...
+var getStoredLanguage = function () { return localStorage.getItem(LS_LANG); };
+var getBrowserLanguage = function () { return navigator.language || navigator.userLanguage; };
+var getLanguage = function () { return getStoredLanguage() || getBrowserLanguage(); };
+var language = getLanguage();

-        '/bower_components/jquery/dist/jquery.min.js'],
-
-    // 2) name your language module here...
-        function(LS, Default, Spanish, French) {
-    var $ = window.jQuery;
-
-    // 3) add your module to this map so it gets used
-    var map = {
-        'fr': French,
-        'es': Spanish,
-    };
+// add your module to this map so it gets used
+// please use the translated name of your language ("Français" and not "French"
+var map = {
+    'fr': 'Français',
+    'es': 'Español',
+    'pl': 'Polski',
+    'de': 'Deutsch',
+    'pt-br': 'Português do Brasil'
+};
 ```

-We need to modify these three places to include our file:
+We need to modify that map to include our translation:

 ```javascript
-define(['/customize/languageSelector.js',
-        '/customize/translations/messages.js',
-        '/customize/translations/messages.es.js',
-        '/customize/translations/messages.fr.js',
+(function () {
+var LS_LANG = "CRYPTPAD_LANG";

-    // 1) additional translation files can be added here...
-        '/customize/translations/messages.pirate.js', // add our module via its path
+var getStoredLanguage = function () { return localStorage.getItem(LS_LANG); };
+var getBrowserLanguage = function () { return navigator.language || navigator.userLanguage; };
+var getLanguage = function () { return getStoredLanguage() || getBrowserLanguage(); };
+var language = getLanguage();

-        '/bower_components/jquery/dist/jquery.min.js'],
-
-    // 2) name your language module here...
-        function(LS, Default, Spanish, French, Pirate) { // name our module 'Pirate' for use as a variable
-    var $ = window.jQuery;
-
-    // 3) add your module to this map so it gets used
-    var map = {
-        'fr': French,
-        'es': Spanish,
-        'pirate': Pirate, // add our module to the map of languages
-    };
+// add your module to this map so it gets used
+// please use the translated name of your language ("Français" and not "French"
+var map = {
+    'fr': 'Français',
+    'es': 'Español',
+    'pl': 'Polski',
+    'de': 'Deutsch',
+    'pt-br': 'Português do Brasil'
+    'pirate': 'English Pirate', // add our module to the map of languages
+};
 ```

-Note that the path to the file is `/customize/translations/`, not `/customize.dist/translations`.
-Cryptpad's server is configured to search for files in `/customize/` first.
-If a file is not found, it falls back to `/customize.dist/`.
-This allows administrators of a Cryptpad installation to override the default behaviour with their own files.
-
-We want translations to be the default behaviour, so we'll place it in `/customize.dist/translations/`, but resolve it via `/customize/translations/`.
-
-The second and third steps are simpler.
 Just add your module in a similar fashion to the existing translations, save your changes, and close `/customize.dist/messages.js`.
 That's all!

-
 ## Actually translating content

 Now we can go back to our file, `/customize.dist/translations/messages.pirate.js` and start to add our Pirate-language customizations.
@ -88,9 +76,7 @@ You should see something like:
 define(function () {
    var out = {};

-    // translations must set this key for their language to be available in
-    // the language dropdowns that are shown throughout Cryptpad's interface
-    out._languageName = 'English';
+    out.main_title = "Cryptpad: Zero Knowledge, Collaborative Real Time Editing";
 ```

 Now you just need to work through this file, updating the strings like so:
@ -99,13 +85,11 @@ Now you just need to work through this file, updating the strings like so:
 define(function () {
    var out = {};

-    // translations must set this key for their language to be available in
-    // the language dropdowns that are shown throughout Cryptpad's interface
-    out._languageName = 'Pirate';
+    out.main_title = "Cryptpad: Knowledge lost at sea while ye scribble with yer mateys";
 ```

 It's important that you modify just the string, and not the variable name which is used to access its content.
-For instance, changing `_languageName` to `_language_name` would make the string `'Pirate'` inaccessible to the rest of the codebase.
+For instance, changing `main_title` to `mainTitle` would make the translated string inaccessible to the rest of the codebase.

 If a key is not found in your translation, the default English version of that key will be used.
 This is to make sure that buttons and other interface elements are not empty, but it's obviously not ideal.
@ -119,8 +103,8 @@ Checking frequently will make it easier to know which change caused the error.

 Additionally, we advise using the apps and visiting the various pages, to make sure that your translations make sense in context.

-When you're happy with your translation file, you can visit http://localhost:3000/assert/ to view Cryptpad's tests.
-Among other things, these tests will check to make sure that your translation has an entry for every entry in the default English translation.
+When you're happy with your translation file, you can visit http://localhost:3000/assert/translations/ to view Cryptpad's tests.
+These tests will check to make sure that your translation has an entry for every entry in the default English translation.

 ## Getting Help

--- a/customize.dist/translations/messages.de.js
+++ b/customize.dist/translations/messages.de.js
@ -0,0 +1,165 @@
+  define(function () {
+      var out = {};
+
+      // translations must set this key for their language to be available in
+      // the language dropdowns that are shown throughout Cryptpad's interface
+      out._languageName = 'German';
+
+      out.main_title = "Cryptpad: Echtzeitzusammenarbeit, ohne Vorwissen";
+      out.main_slogan = "Einigkeit macht stark - Zusammenarbeit ist der Schlüssel"; // Der Slogan sollte evtl. besser englisch bleiben.
+
+      out.type = {};
+      out.type.pad = 'Pad';
+      out.type.code = 'Code';
+      out.type.poll = 'Umfrage';
+      out.type.slide = 'Präsentation';
+
+      out.common_connectionLost = 'Serververbindung verloren';
+
+      out.disconnected = 'Getrennt';
+      out.synchronizing = 'Synchronisiert';
+      out.reconnecting = 'Verbindung wird neu aufgebaut...';
+      out.lag = 'Lag';
+      out.readonly = 'Nur-Lesen';
+      out.anonymous = "Anonymous";
+      out.yourself = "Du";
+      out.anonymousUsers = "anonyme Nutzer*innen";
+      out.anonymousUser = "anonyme Nutzer*in";
+      out.users = "Nutzer*innen";
+      out.and = "Und";
+      out.viewer = "Betrachter*in";
+      out.viewers = "Betrachter*innen";
+      out.editor = "Bearbeiter*in";
+      out.editors = "Bearbeiter*innen";
+
+      out.greenLight = "Alles funktioniert bestens";
+      out.orangeLight = "Deine langsame Verbindung kann die Nutzung beinträchtigen";
+      out.redLight = "Du wurdest von dieser Sitzung getrennt";
+
+      out.importButtonTitle = 'Importiere eine lokale Datei in dieses Dokument';
+
+      out.exportButtonTitle = 'Exportiere dieses Dokument in eine lokale Datei';
+      out.exportPrompt = 'Wie möchtest du die Datei nennen?';
+
+
+      out.changeNamePrompt = 'Ändere deinen Namen (oder lasse dieses Feld leer um anonym mitzuarbeiten): ';
+
+      out.clickToEdit = "Zum bearbeiten klicken";
+
+      out.forgetButtonTitle = 'Entferne dieses Dokumnt von deiner Startseitenliste';
+      out.forgetPrompt = 'Mit dem Klick auf OK wird das Dokument aus deinem lokalen Speicher gelöscht. Fortfahren?';
+
+      out.shareButton = 'Teilen';
+      out.shareSuccess = 'URL wurde in die Zwischenablage kopiert';
+
+      out.presentButtonTitle = "Präsentationsmodus starten";
+      out.presentSuccess = 'Hit ESC to exit presentation mode';
+
+      out.backgroundButtonTitle = 'Die Hintergrundfarbe der Präsentation ändern';
+      out.colorButtonTitle = 'Die Textfarbe im Präsentationsmodus ändern';
+
+      // Hierfür fehlt eine passende Übersetzung...
+
+      out.editShare = "Mitarbeits-URL teilen";
+      out.editShareTitle = "Mitarbeits-URL in die Zwischenablage kopieren";
+      out.viewShare = "Nur-Lesen-URL teilen";
+      out.viewShareTitle = "Nur-Lesen-URL in die Zwischenablage kopieren";
+      out.viewOpen = "In neuem Tab anzeigen";
+      out.viewOpenTitle = "Dokument im Nur-Lesen-Modus in neuem Tab öffnen.";
+
+      out.notifyJoined = "{0} ist der gemeinsamen Sitzung beigetreten";
+      out.notifyRenamed = "{0} heißt nun {1}";
+      out.notifyLeft = "{0} hat die gemeinsame Sitzung verlassen";
+
+      out.tryIt = 'Probier\'s aus!';
+
+      out.okButton = 'OK (enter)';
+      out.cancelButton = 'Abbrechen (esc)';
+
+      // Polls
+
+      out.poll_title = "Kenntnisfreier Datumsplaner";
+      out.poll_subtitle = "Kenntnisfreies, <em>echtzeit</em> planen";
+
+      out.poll_p_save = "Deine Einstellungen werden sofort automatisch gesichtert.";
+      out.poll_p_encryption = "Alle Eingaben sind verschlüsselt, deshalb haben nur Leute im Besitz des Links Zugriff. Selbst der Server sieht nicht was du änderst.";
+
+      out.wizardLog = "Klicke auf den Button links oben um zur Umfrage zurückzukehren.";
+      out.wizardTitle = "Nutze den Assistenten um deine Umfrage zu erstellen.";
+      out.wizardConfirm = "Bist du wirklich bereit die angegebenen Optionen bereits zu deiner Umfrage hinzuzufügen?";
+
+      out.poll_closeWizardButton = "Assistenten schließen";
+      out.poll_closeWizardButtonTitle = "Assistenten schließen";
+      out.poll_wizardComputeButton = "Optionen übernehmen";
+      out.poll_wizardClearButton = "Tabelle leeren";
+      out.poll_wizardDescription = "Erstellt automatisch die Optionen indem eine beliebige Anzahl von Daten und Zeiten eingegeben wird.";
+      out.poll_wizardAddDateButton = "+ Daten";
+      out.poll_wizardAddTimeButton = "+ Zeiten";
+
+      out.poll_optionPlaceholder = "Option";
+      out.poll_userPlaceholder = "Dein Name";
+      out.poll_removeOption = "Bist du sicher, dass du diese Option entfernen möchtest?";
+      out.poll_removeUser = "Bist du sicher, dass du diese Nutzer*in entfernen möchtest?";
+
+      out.poll_titleHint = "Titel";
+      out.poll_descriptionHint = "Beschreibung";
+
+      // index.html
+
+      out.main_howitworks = 'Wie es funktioniert';
+      out.main_p2 = 'Dieses Projekt nutzt den <a href="http://ckeditor.com/">CKEditor</a> visuellen Editor, <a href="https://codemirror.net/">CodeMirror</a>, und die <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> realtime engine.';
+      out.main_howitworks_p1 = 'CryptPad nutzt eine Variante des <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> Algorithmus. Dieser kann mit Hilfe der <a href="https://bitcoin.org/bitcoin.pdf">Nakamoto Blockchain</a>, einem Konstrukt, das durch das <a href="https://de.wikipedia.org/wiki/Bitcoin">Bitcoin</a>-Projekt Bekanntheit erlangte, verteilten Konsens (distributed consensus) finden. Damit ist der Algorithmus nicht auf einen zentralen Server angewiesen um Konflikte zu lösen &mdash; der Server muss also nichts vom Inhalt der Pads wissen.';
+
+      out.main_about_p2 = 'Für Fragen und Kommentare kannst du uns <a href="https://twitter.com/cryptpad">tweeten</a>, ein Ticket <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">auf Github öffnen</a>, hi auf irc sagen (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), oder <a href="mailto:research@xwiki.com">eine Mail zukommen lassen</a>.';
+
+      out.button_newpad = 'NEUES WYSIWYG-PAD ERSTELLEN';
+      out.button_newcode = 'NEUES CODE-PAD ERSTELLEN';
+      out.button_newpoll = 'NEUE ABSTIMMUNG ERSTELLEN';
+      out.button_newslide = 'NEUE PRÄSENTATION ERSTELLEN';
+
+      // privacy.html
+
+      out.policy_title = 'Cryptpad Datenschutzbestimmungen';
+      out.policy_whatweknow = 'Was wir über dich wissen';
+      out.policy_whatweknow_p1 = 'Als Programm, das im Web gehostet wird, hat Cryptpad Zugriff auf die Metadaten, die vom HTTP-Protokoll exponiert werden. Inbegriffen ist deine IP-Adresse und diverse andere HTTP-Header, die es ermöglichen deinen Browser zu identifizieren. Um zu sehen welche Daten dein Browser preis gibt kanst du die Seite <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a> besuchen.';
+      out.policy_whatweknow_p2 = 'Wir nutzen <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, eine open source Analyseplatform um mehr über unsere Nutzer*innen zu lernen. Piwik teilt uns mit, wie du Cryptpad gefunden hast &mdash; durch direkten Zugriff, mit Hilfe eine Suchmaschine oder über einen Link auf einer anderen Seite wie z.B. Reddit oder Twitter. Außerdem lernen wir mehr über deinen Besuch, welchen Link du auf den Informationsseiten klickst und wie lange du auf diesen Seiten verweilst.';
+      out.policy_howweuse = 'Wie wir das Wissen anwenden';
+      out.policy_howweuse_p1 = 'Wir nutzen diese Informationen um besser entscheiden zu können wie Cryptpad beworben werden kann und um genutzte Strategien zu evaluieren. Informationen über deinen Standort helfen uns abzuschätzen welche Sprachen wir besser unterstützen sollten.';
+      out.policy_howweuse_p2 = "Informationen zu deinem Browser (ob du auf einem Desktop oder Smartphone arbeitest) hilft uns außerdem dabei zu entscheiden, welche Features priorisiert werden sollen. Unser Entwicklerteam ist klein, deshalb ist es uns wichtig Entscheidungen derart zu treffen, dass die Erfahrung der größten Zahl von Nutzer*innen verbessert wird.";
+      out.policy_whatwetell = 'Was wir anderen über die erzählen';
+      out.policy_whatwetell_p1 = 'Wir reichen keine von uns gesammelten Daten weiter, außer im Falle einer gerichtlichen Anordnung.';
+      out.policy_links = 'Links zu anderen Seiten';
+      out.policy_links_p1 = 'Diese Seite beinhaltet Links zu anderen Seiten, teilweise werden diese von anderen Organisationen verwaltet. Wir sind nicht für den Umgang mit der Privatsphäre und die Inhalte der anderen Seiten verantwortlich. Generell werden Links zu externen Seiten in einem neuem Fenster geöffnet, um zu verdeutlichen, dass du Cryptpad.fr verlässt.';
+      out.policy_ads = 'Werbung';
+      out.policy_ads_p1 = 'Wir zeigen keine Onlinewerbung, können aber zu Organisationen verlinken, die unsere Forschung finanzieren.';
+      out.policy_choices = 'Deine Möglichkeiten';
+      out.policy_choices_open = 'Unser Code ist open source, deshalb kannst du jederzeit deine eigene Cryptpad-Instanz hosten.';
+      out.policy_choices_vpn = 'Wenn du unsere gehostete Instanz nutzen möchtest bitten wir dich darum IP-Adresse zu verschleiern, das geht zum Beispiel mit dem <a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads vor Torproject" target="_blank" rel="noopener noreferrer">Tor browser bundle</a>, oder einem <a href="https://riseup.net/en/vpn" title="VPNs provided by Riseup" target="_blank" rel="noopener noreferrer">VPN-Zugang</a>.';
+      out.policy_choices_ads = 'Wenn du unsere Analysesoftware blockieren möchtest kannst du Adblock-Software wie <a href="https://www.eff.org/privacybadger" title="download privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a> verwenden.';
+
+      // terms.html
+
+      out.tos_title = "Cryptpad Nutzungsbedingungen";
+      out.tos_legal = "Sei nicht bösartig, missbrauchend und mach nichts illegales.";
+      out.tos_availability = "Wir hoffen, dass dir dieser Service nützt, aber Erreichbarkeit und Performanz können nicht garantiert werden. Bitte exportiere deine Daten regelmäßig.";
+      out.tos_e2ee = "Cryptpad Dokumente können von allen gelesen oder bearbeitet werden, die den \"fragment identifier\" des Dokuments erraten oder auf eine andere Art davon erfahren. Wir empfehlen dir Ende-Zu-Ende verschlüsselte Nachrichtentechnik (e2ee) zum Versenden der URLs zu nutzen. Wir übernehmen keine Haftung falls eine URL erschlichen oder abgegriffen wird.";
+      out.tos_logs = "Metadaten, die dein Browser bereitstellt, können geloggt werden, um den Service aufrechtzuerahlten.";
+      out.tos_3rdparties = "Wir geben keine Individualdaten an dritte Weiter, außer auf richterliche Anordnung.";
+
+      // BottomBar.html
+
+      out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Mit <img class="bottom-bar-heart" src="/customize/heart.png" /> in <img class="bottom-bar-fr" src="/customize/fr.png" /> gemacht</a>';
+      out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">Ein <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs Project </a> mit Hilfe von <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+
+      // Header.html
+
+      out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Mit <img class="bottom-bar-heart" src="/customize/heart.png" /> von <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> und <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+
+
+      // TODO Hardcode cause YOLO
+      //out.header_xwiki = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer"><img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+      out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+      out.header_logoTitle = 'Zur Hauptseite';
+
+      return out;
+  });
--- a/customize.dist/translations/messages.es.js
+++ b/customize.dist/translations/messages.es.js
@ -11,26 +11,18 @@ define(function () {
    out.type.code = 'Código';
    out.type.poll = 'Encuesta';
    out.type.slide = 'Presentación';
-
-    out.errorBox_errorType_disconnected = 'Conexión perdida';
-    out.errorBox_errorExplanation_disconnected = [
-        'Se perdio la conexion con el servidor, tu puedes reconectarte actualizando la pagina o revisando tu trabajo ',
-        'haciendo click por fuera de este cuadro.'
-    ].join('');
-
-    out.common_connectionLost = 'Conexión perdida con el servidor';
+    out.type.whiteboard = 'Pizarra';
+    out.type.contacts = 'Contactos';

    out.disconnected = "Desconectado";
    out.synchronizing = "Sincronización";
-    out.reconnecting = "Reconectando";
+    out.reconnecting = "Reconectando...";
    out.lag = "Retraso";
-    out.readOnly = 'Solo lectura';
+    out.readonly = 'Solo lectura';
    out.anonymous = 'Anónimo';
-    out.yourself = "tú mismo";
+    out.yourself = "Tú mismo";
    out.anonymousUsers = "usuarios anónimos";
    out.anonymousUser = "usuario anónimo";
-    out.shareView = "URL de sólo lectura";
-    out.shareEdit = "Editar URL";
    out.users = "Usuarios";
    out.and = "y";
    out.viewer = "espectador";
@ -38,207 +30,517 @@ define(function () {
    out.editor = "editor";
    out.editors = "editores";

-    out.editingAlone = 'Editar solo';
-    out.editingWithOneOtherPerson = 'Editar con otra persona';
-    out.editingWith = 'Editar con ';
-    out.otherPeople = 'Otras personas';
-    out.disconnected = 'Desconectado';
-    out.synchronizing = 'Sincronizando';
-    out.reconnecting = 'Reconectando...';
-    out.lag = 'Retraso';
-    out.readonly = 'Solo lectura';
-    out.nobodyIsEditing = 'Nadie está editando';
-    out.onePersonIsEditing = 'Una personas está editando';
-    out.peopleAreEditing = '{0} personas están editando';
-    out.oneViewer = '1 visualizando';
-    out.viewers = '{0} están visualizando';
-    out.anonymous = "Actualmente eres anónimo";
+    out.greenLight = "Todo funciona bién";
+    out.orangeLight = "La conexión es lenta y podria impactar la experiencia";
+    out.redLight = "Has sido desconectado de la sesión";

-    out.greenLight = "Todo esta trabajando bién";
-    out.orangeLight = "Tu conexion es lenta y podria impactar en el desempeño de tu experiencia";
-    out.redLight = "¡Has sido desconectado de la sesión! ";
-
-    out.importButton = 'IMPORTAR';
    out.importButtonTitle = 'Importar un documento de tus archivos locales';

-    out.exportButton = 'EXPORTAR';
    out.exportButtonTitle = 'Exportar este documento a un archivo local';
-    out.exportPrompt = '¿Como te gustaria nombra tu archivo ?';
+    out.exportPrompt = '¿Cómo te gustaría llamar a este archivo?';

-    out.back = '&#8656; Atras';
-    out.backToCryptpad = '⇐ Atras a Cryptpad';
+    out.changeNamePrompt = 'Cambiar tu nombre (dejar vacío para ser anónimo): ';

-    out.userButton = 'USUARIO';
-    out.userButtonTitle = 'Cambiar tu nombre de usuario';
-    out.changeNamePrompt = 'Cambiar tu nombre: ';
+    out.clickToEdit = "Haz clic para cambiar";

-    out.renameButton = 'RENOMBRAR';
-    out.renameButtonTitle = 'Cambiar el titulo del documento listado en tu pagina de inicio';
-    out.renamePrompt = 'Como titularias este noja?';
-    out.renameConflict = 'Otra nota tiene ya ese titulo';
-    out.clickToEdit = "Haz click para editar";
-
-    out.forgetButton = 'OLVIDAR';
    out.forgetButtonTitle = 'Eliminar este documento de la lista en la pagina de inicio';
-    out.forgetPrompt = 'Presiona OK, removera la URL para esta nota desde el almacenamiento local, ¿Esta seguro?';
+    out.forgetPrompt = 'Pulser OK eliminará este documento del almacenamiento local (localStorage), ¿estás seguro?';

-    out.shareButton = 'COMPARTIR';
-    out.shareButtonTitle = "Copiar URL al portapapeles";
-    out.shareSuccess = '¡URL Copiada al portapapeles!';
-    out.shareFailed = "Fallo al copiar URL al portapapeles";
+    out.shareButton = 'Compartir';
+    out.shareSuccess = 'URL copiada al portapapeles';

-    out.presentButton = 'PRESENTAR';
-    out.presentButtonTitle = "Ingresar en modo presentación";
+    out.presentButtonTitle = "Entrar en el modo presentación";
    out.presentSuccess = 'ESC para salir del modo presentación';
-    out.sourceButton = 'VER CÓDIGO FUENTE';
-    out.sourceButtonTitle = "Abandonar modo presentación";

-    out.backgroundButton = 'COLOR DE FONDO';
    out.backgroundButtonTitle = 'Cambiar el color de fondo en el modo presentación';
-    out.colorButton = 'COLOR DE TEXTO';
    out.colorButtonTitle = 'Cambiar el color de texto en el modo presentación';

-    out.commitButton = 'COMMIT';
-
-    out.getViewButton = 'URL SOLO-LECTURA';
-    out.getViewButtonTitle = 'Obtener URL de solo lectura para este documento';
-    out.readonlyUrl = 'Documento de solo lectura';
-    out.copyReadOnly = "Copiar URL al portapapeles";
-    out.openReadOnly = "Abrir en nueva pestaña";
-
-    // TODO VERIFY
    out.editShare = "URL de edición compartida";
    out.editShareTitle = "Copiar la URL de edición al portapapeles";
-    out.viewShare = "Compartir vista URL";
+    out.viewShare = "Compartir URL de solo lectura";
    out.viewShareTitle = "Copiar la URL de solo lectura al portapapeles";
-    out.viewOpen = "Ver en nueva pestaña";
-    out.viewOpenTitle = "Abrir el documento en modo de sólo lectura en una nueva pestaña";
+    out.viewOpen = "Ver en pestaña nueva";
+    out.viewOpenTitle = "Abrir el documento en solo lectura en una pestaña nueva";

    out.notifyJoined = "{0} se ha unido a la sesión de colaboración";
    out.notifyRenamed = "{0} ahora se conoce como {1}";
    out.notifyLeft = "{0} ha dejado la sesión de colaboración";

-    out.disconnectAlert = '¡Conexión de Red perdida!';
+    out.tryIt = '¡Pruébalo!';

-    out.tryIt = '¡PROBARLO!';
-    out.recentPads = 'Tus notas recientes (están almacenadas en el navegador)';
-
-    out.okButton = 'OK (enter)';
-    out.cancelButton = 'Cancelar (esc)';
-
-    out.loginText = '<p>Tu nombre de usuario y password son usados para generar una llave unica que es desconocida por nuestro servidor.</p>\n' +
-                    '<p>Se cuidados no olvides tus credenciales, son imposibles de recuperar</p>';
-
-    out.forget = "Olvidar";
+    out.okButton = 'OK (Enter)';
+    out.cancelButton = 'Cancelar (Esc)';

    // Polls

-    out.poll_title = "Zero Knowledge selector de fecha";
-    out.poll_subtitle = "Zero Knowledge, agenda en <em>tiempo real</em> ";
+    out.poll_title = "Selector de fecha Zero Knowledge";
+    out.poll_subtitle = "Agenda en <em>tiempo real</em> Zero Knowledge";

-    out.poll_p_save = "Tus configuraciones son actualizadas instantaneamente, no es necesario guardar cambios.";
-    out.poll_p_encryption = "Todos los datos de entrada son cifrados, solo las personas que posee el link tiene acceso. Incluso desde el servidor no puede ver tus cambios.";
-    out.poll_p_howtouse = "Ingresa tu nombre en el campo de entrada en la parte inferior y verificalo";
+    out.poll_p_save = "Tus configuraciones se actualizan instantaneamente, no es necesario guardar cambios.";
+    out.poll_p_encryption = "Todos los datos entrados son cifrados, solo las personas que poseen el enlace tienen acceso. Incluso el servidor no puede ver el contenido.";

-    out.promptName = "¿ Cual es tu nombre ?";
-
-    out.wizardButton = 'ASISTENTE';
-    out.wizardLog = "Presiona el boton en la parte superior izquierda para regresar a la encuesta";
+    out.wizardLog = "Presiona el boton en la parte superior izquierda para volver a la encuesta";
    out.wizardTitle = "Utiliza el asistente para crear tu encuesta";
-    out.wizardConfirm = "¿Estas realmente seguro de agregar estas opciones a tu encuesta?";
+    out.wizardConfirm = "¿Estás realmente seguro de agregar estas opciones a tu encuesta?";

    out.poll_closeWizardButton = "Cerrar el asistente";
    out.poll_closeWizardButtonTitle = "Cerrar el asistente";
-    out.poll_wizardComputeButton = "Computar opciones";
+    out.poll_wizardComputeButton = "Generar opciones";
    out.poll_wizardClearButton = "Limpiar tabla";
-    out.poll_wizardDescription = "Automaticamente crear un number de opciones ingresando cualquier numero de fechas y segmentos de tiempo";
+    out.poll_wizardDescription = "Automaticamente crear opciones ingresando cualquier cantidad de fechas y horas";
    out.poll_wizardAddDateButton = "+ Fechas";
    out.poll_wizardAddTimeButton = "+ Horas";

-    out.poll_addUserButton = "+ Usuarios";
-    out.poll_addUserButtonTitle = "Click para adicionar usuario";
-    out.poll_addOptionButton = "+ Opciones";
-    out.poll_addOptionButtonTitle = "Click para adicionar una opción";
-    out.poll_addOption = "Proponer una opción";
    out.poll_optionPlaceholder = "Opción";
-    out.poll_addUser = "Ingresar un nombre";
    out.poll_userPlaceholder = "Tu nombre";
-    out.poll_removeOption = "¿Seguro que te gustaria eliminar esta opción?";
-    out.poll_removeOptionTitle = "Eliminar la fila";
-    out.poll_removeUser = "¿Seguro que te gustaria eliminar este usuario?";
-    out.poll_removeUserTitle = "Eliminar la columna";
-    out.poll_editOption = "¿Seguro que te gustaria editar esta opción?";
-    out.poll_editOptionTitle = "Editar la fila";
-    out.poll_editUser = "¿Seguro que te gustaria editar este usuario?";
-    out.poll_editUserTitle = "Editar la columna";
+    out.poll_removeOption = "¿Estás seguro que quieres eliminar esta opción?";
+    out.poll_removeUser = "¿Estás seguro que quieres eliminar este usuario?";

-    out.poll_titleHint = "Titulo";
+    out.poll_titleHint = "Título";
    out.poll_descriptionHint = "Descripción";

    // index.html

-    out.main_p1 = 'CryptPad es un editor en tiempo <strong>zero knowledge</strong>.  El cifrado es llevado acabo en tu navegador protegiendo los datos de, sistemas en la nube, and la NSA. La clave cifrado privada es almacenada en la URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> lo cual no es nunca enviado al servidor pero esta disponible para el javascript compartiendo la URL, tu autorizas a otros quienes desean participar.';
-    out.main_p2 = 'Este proyecto usa <a href="http://ckeditor.com/">CKEditor</a> un editor de texto, <a href="https://codemirror.net/">CodeMirror</a>, y <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> un motor de tiempo real.';
-    out.main_howitworks = '¿Como Funciona?';
+    out.main_p2 = 'Este proyecto utiliza el editor de texto visual <a href="http://ckeditor.com/">CKEditor</a>, <a href="https://codemirror.net/">CodeMirror</a>, y el motor en tiempo real <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a>.';
+    out.main_howitworks = '¿Cómo funciona?';
+    out.main_howitworks_p1 = "CryptPad utiliza una variante del algoritmo de <a href='https://en.wikipedia.org/wiki/Operational_transformation'>transformación operacional</a> (página en inglés) que es capaz de encontrar un consenso distribuido usando un <a href='https://bitcoin.org/bitcoin.pdf'>Blockchain Nakamoto</a> (página en inglés), popularizado por <a href='https://es.wikipedia.org/wiki/Bitcoin'>Bitcoin</a>. De esta manera el algoritmo puede evitar la necesidad de un servidor central para resolver conflictos de edición de la transformación operacional y sin necesidad de resolver conflictos, el servidor puede mantenerse inconsciente del contenido que se está editando en el pad.";
+    out.main_about_p2 = 'Si tienes preguntas o comentarios, puedes <a href="https://twitter.com/cryptpad">enviarnos un tweet</a>, abrir un issue <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="nuestro issue tracker">en GitHub</a>, saludarnos en nuestro canal IRC (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), o <a href="mailto:research@xwiki.com">envianos un email</a>.';

-    out.main_howitworks_p1 = "CryptPad utiliza una variante del algoritmo de <a href='https://en.wikipedia.org/wiki/Operational_transformation'>transformación Operacional</a> que es capaz de encontrar el consenso distribuido usando un <a href='https://bitcoin.org/bitcoin.pdf'>Nakamoto Blockchain</a>, una construcción popularizada por <a href='https://en.wikipedia.org/wiki/Bitcoin'>Bitcoin</a> . De esta manera el algoritmo puede evitar la necesidad de un servidor central para resolver Conflictos de Edición de Transformación Operacional y sin necesidad de resolver conflictos, el servidor puede mantenerse inconsciente del contenido que se está editando en el pad.";
-
-
-    out.main_about = 'Acerca de';
-    out.main_about_p1 = 'Tu puedes leer mas acerca de nuestra <a href="/privacy.html" title="">politica de privacidad</a> y <a href="/terms.html">terminos de servicio</a>.';
-
-    out.main_about_p2 = 'Si tu tienes preguntas o comentarios, tu puedes <a href="https://twitter.com/cryptpad">tweetearnos </a>,o abrir un issue <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">en github</a>, ven y di hola a nuestro canal de irc (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), o <a href="mailto:research@xwiki.com">envianos un email</a>.';
-
-    out.table_type = 'Tipo';
-    out.table_link = 'Link';
-    out.table_created = 'Creado';
-    out.table_last = 'Ultimo Acceso';
-
-    out.button_newpad = 'CREAR NUEVA NOTA DE TEXTO ENRIQUECIDO';
-    out.button_newcode = 'CREAR NUEVA NOTA DE CÓDIGO';
-    out.button_newpoll = 'CREAR NUEVA ENCUESTA';
-    out.button_newslide = 'CREAR NUEVA PRESENTACIÓN';
+    out.button_newpad = 'Crear nuevo pad de texto enriquezido';
+    out.button_newcode = 'Crear nuevo pad de código';
+    out.button_newpoll = 'Crear nueva encuesta';
+    out.button_newslide = 'Crear nueva presentación';

    // privacy.html

-    out.policy_title = 'Cryptpad Política de privacidad';
-    out.policy_whatweknow = 'Que sabemos sobre tí';
-    out.policy_whatweknow_p1 = 'Como una aplicación que esta hospedada en la red, Cryptpad tiene acceso a los metadatos expuestos por el protocolo HTTP. Esto incluye tu direccion IP, y otros headers HTTP que puede ser usados para identificar particularmente tu navegador. Tu puedes comprar la informacion que comparte tu navegador visitando <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="Que headers HTTP esta compartiendo mi navegador">WhatIsMyBrowser.com</a>.';
-    out.policy_whatweknow_p2 = 'Nosotros usamos <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, an open source analytics platform, to learn more about our users. Piwik tells us about how you found Cryptpad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter. We also learn when you visit, what links you click while on our informational pages, and how long you stay on a particular page.';
-    out.policy_whatweknow_p3 = 'Estas herramientas de estadística son usadas solamente para informacion local . Nosotros no recolectamos cualquier informacion sobre el uso de nuestro zero-knowledge application.';
-    out.policy_howweuse = 'Como nosotros usamos lo que aprendemos';
-    out.policy_howweuse_p1 = 'Nosotros usamos esta informacion para tomar mejores decisiones como promover y promocionar Cryptpad, para evaluar cual de nuestros esfuerzos pasados han sido exitosos. La informacion sobre tu ubicacion nos permite conocer si nosotros debemos considerar mejor soporte para otros idiomas diferentes al ingles.';
-    out.policy_howweuse_p2 = "La informacion sobre tu navegador (si es un sistema operativo de escritorio o movil) nos ayuda a tomar medidads en las caracteristicas que debemos priorizar y mejorar. Nuestro equipo de desarrollo es pequeño, intentamos hacer elecciones que beneficien la mayoria de los usuarios' experiencia como sea posible.";
-    out.policy_whatwetell = 'Lo que nosotros le decimos a otros sobre tí';
-    out.policy_whatwetell_p1 = 'No suministramos información a terceros, ni la que usted nos proporciona a nosotros a menos de ser obligados legalmente a hacerlo.';
-    out.policy_links = 'Links a Otros sitios';
-    out.policy_links_p1 = 'Este sitio contiene links a otros sitios, incluyendo algunos producidos por otras organizaciones. Nosotros no nos responsabilisamos por el tratamiento, privacidad de los datos y contenido de sitios externos. Como regla general, los links externos son abiertos una nueva pestaña del navegador, para hacerlo claro tu estas abandonando Cryptpad.fr.';
-    out.policy_ads = 'Anuncio';
-    out.policy_ads_p1 = 'Nosotros no mostramos anuncios online, pensamos que podemos linkear a las personas que financian nuestra investigación.';
-    out.policy_choices = 'Eleciones que tu tienes';
-    out.policy_choices_open = 'Nuestro código es open source, Entonces tu siempre tienes la opcion crear tu propia estancia de Cryptpad.';
-    out.policy_choices_vpn = 'Si tu deseas usar nuestra estancia, pero no deseas exponer tu dirección IP, tu puedes proteger tu dirección IP utilizando <a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads from the Tor project" target="_blank" rel="noopener noreferrer">Tor browser bundle</a>, o una  <a href="https://riseup.net/en/vpn" title="VPNs provided by Riseup" target="_blank" rel="noopener noreferrer">VPN</a>.';
-    out.policy_choices_ads = 'If usted desea blockear rastreadores, y plataformas similares puedes utilizar herramientas como <a href="https://www.eff.org/privacybadger" title="download privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';
+    out.policy_title = 'Política de privacidad Cryptpad';
+    out.policy_whatweknow = 'Qué sabemos sobre tí';
+    out.policy_whatweknow_p1 = 'Como cualquier aplicación que está en la red, Cryptpad tiene acceso a los metadatos expuestos por el protócolo HTTP. Esto incluye tu dirección IP, y otros headers HTTP que pueden ser utilizados para identificar a tu navegador propio. Puedes ver la información que comparte tu navegador visitando <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="Que headers HTTP esta compartiendo mi navegador">WhatIsMyBrowser.com</a> (página en inglés).';
+    out.policy_whatweknow_p2 = 'Nosotros usamos <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, una plataforma de analítica de datos abierta, para mejor conocer a nuestros usuarios. Piwik nos dice como encontráste Cryptpad, en entrada manual, por un motor de busquéda, or por referal de otra página como Reddit o Twitter. También aprendemos cuándo visitas, que páginas vees en nuestra web, y cuánto tiempo te quedas en cada una.';
+    out.policy_howweuse = 'Cómo usamos lo que aprendemos';
+    out.policy_howweuse_p1 = 'Usamos esta información para tomar mejores decisiones para promocionar Cryptpad, para evaluar cuáles de nuestros esfuerzos han sido exitosos. La información sobre tu ubicación nos permite saber si deberíamos considerar mejor soporte para idiomas diferentes al inglés.';
+    out.policy_howweuse_p2 = "La información sobre tu navegador (en escritorio u movil) nos ayuda a saber qué caracteristicas que debemos mejorar. Nuestro equipo de desarrollo es pequeño, e intentamos tomar decisiones que beneficien a la experiencia de la mayoria de nuestros usuarios.";
+    out.policy_whatwetell = 'Lo que decimos a otros sobre tí';
+    out.policy_whatwetell_p1 = 'No suministramos la información que colectamos a terceros a menos de ser legalmente obligados a hacerlo.';
+    out.policy_links = 'Enlaces a otras páginas';
+    out.policy_links_p1 = 'Esta web contiene enlaces a otros sitios, incluyendo algunos producidos por otras organizaciones. No somos responsables por el tratamiento de la privacidad de los datos y el contenido de páginas externas. Como regla general, los enlaces externos se abren en una nueva pestaña del navegador, para clarificar que estás abandonando a Cryptpad.fr.';
+    out.policy_ads = 'Anuncios';
+    out.policy_ads_p1 = 'Nosotros no mostramos anuncios, pero podemos poner enlaces a las organizaciones que financian nuestro trabajo de investigación.';
+    out.policy_choices = 'Lo que puedes hacer';
+    out.policy_choices_open = 'Nuestro código fuente es abierto para que siempre tengas la opción de desplegar tu propia instancia de Cryptpad.';
+    out.policy_choices_vpn = 'Si deseas utilizar nuestra instancia, pero no deseas exponer tu dirección IP, puedes protegerla utilizando <a href="https://www.torproject.org/projects/torbrowser.html.en" title="descargas Tor project" target="_blank" rel="noopener noreferrer">el navegador Tor</a>, o un <a href="https://riseup.net/en/vpn" title="VPNs por Riseup" target="_blank" rel="noopener noreferrer">VPN</a>.';
+    out.policy_choices_ads = 'Si deseas no ser seguido por nuestra plataforma, puedes utilizar herramientas como <a href="https://www.eff.org/privacybadger" title="descargar a Privacy Badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';

    // terms.html

-    out.tos_title = "Cryptpad Términos de Servicio";
-    out.tos_legal = "Porfavor no seas malicioso, abusivo o realices prácticas ilegales.";
-    out.tos_availability = "Nosotros esperamos que encuentres este servicio util, pero nuestra disponibilidad o desempeño no pueden ser garantizados. Por favor exporta tus datos regularmente.";
-    out.tos_e2ee = "Cryptpad Los documentos pueden ser leidos o modificados para alguien puede ser invitado o por el contrario obtener un fragmento del documento. Nosotros recomendamos que tu uses cifrado punto a punto(e2ee) para compartir URLs, no asumimos ninguna responsabilidad en el evento de que existan fugas de URLs.";
-    out.tos_logs = "Los metadatos entregados por el navegador a el servidor pueden ser logueados y almacenados para propuestas de mantener el servicio.";
-    out.tos_3rdparties = "Nosotros no proveemos datos individualizados a terceros a menos que sea requerido por la ley.";
+    out.tos_title = "Condiciones de servicio Cryptpad";
+    out.tos_legal = "Por favor, no seas malicioso, abusivo o hagas algo ilegal.";
+    out.tos_availability = "Esperamos que este servicio te parezca util, pero nuestra disponibilidad o rendimiento no pueden ser garantizados. Por favor, exporta tus datos regularmente.";
+    out.tos_e2ee = "Los documentos Cryptpad pueden ser leidos o modificados por cualquiera que pueda adivinar o que pueda tener el enlace. Recomendamos que utilizes mensajes cifrados de punto a punto (e2ee) para compartir URLs, no asumimos ninguna responsabilidad en el evento de alguna fuga.";
+    out.tos_logs = "Los metadatos entregados por el navegador al servidor pueden ser almacenados para la mantenencia del servicio.";
+    out.tos_3rdparties = "No proveemos datos individualizados a terceros a menos de ser obligados por la ley.";

    // BottomBar.html

-    out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Made with <img class="bottom-bar-heart" src="/customize/heart.png" /> en <img class="bottom-bar-fr" src="/customize/fr.png" /></a>';
-    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">An <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs Project </a> with the support of <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+    out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Hecho con <img class="bottom-bar-heart" src="/customize/heart.png" alt="amor" /> en <img class="bottom-bar-fr" src="/customize/fr.png" alt="Francia" /></a>';
+    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">Un <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/>Proyecto Labs</a> con el soporte de <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"><img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';

    // Header.html

-    out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">With <img class="bottom-bar-heart" src="/customize/heart.png" /> from <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> by <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+    out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Con <img class="bottom-bar-heart" src="/customize/heart.png" alt="amor" /> de <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="Francia"/> por <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
    out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferre-r"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
-    out.header_logoTitle = 'Ir a la pagina principal';
+    out.header_logoTitle = 'Ir a la página principal';
+
+    out.websocketError = "Error al conectarse al servidor WebSocket";
+    out.typeError = "Este documento no es compatible con la applicación seleccionada";
+    out.onLogout = "Tu sesión está cerrada, <a href=\"/\" target=\"_blank\">haz clic aquí</a> para iniciar sesión<br>o apreta sobre <em>Escape</em> para acceder al documento en modo solo lectura.";
+    out.loading = "Cargando...";
+    out.error = "Error";
+    out.language = "Idioma";
+    out.user_rename = "Cambiar nombre";
+    out.user_displayName = "Nombre visible";
+    out.user_accountName = "Nombre de cuenta";
+    out.newButton = "Nuevo";
+    out.newButtonTitle = "Nuevo documento";
+    out.cancel = "Cancelar";
+    out.poll_publish_button = "Publicar";
+    out.poll_admin_button = "Administrar";
+    out.poll_create_user = "Añadir usuario";
+    out.poll_create_option = "Añadir opción";
+    out.poll_commit = "Validar";
+    out.fm_rootName = "Documentos";
+    out.fm_trashName = "Papelera";
+    out.fm_unsortedName = "Sin organizar";
+    out.fm_filesDataName = "Todos los archivos";
+    out.fm_templateName = "Plantilla";
+    out.fm_newButton = "Nuevo";
+    out.fm_newFolder = "Nueva carpeta";
+    out.fm_folder = "Carpeta";
+    out.fm_folderName = "Nombre de carpeta";
+    out.fm_numberOfFolders = "# de carpetas";
+    out.fm_numberOfFiles = "# de archivos";
+    out.fm_fileName = "Nombre";
+    out.fm_title = "Título";
+    out.fm_lastAccess = "Último acceso";
+    out.fm_creation = "Creación";
+    out.fm_forbidden = "Acción prohibida";
+    out.fm_originalPath = "Enlace original";
+    out.fm_noname = "Documento sín título";
+    out.fm_emptyTrashDialog = "¿Seguro qué quieres vaciar la papelera?";
+    out.fm_removeSeveralPermanentlyDialog = "¿Seguro qué quieres eliminar estos {0} elementos de la papelera para siempre?";
+    out.fm_removePermanentlyDialog = "¿Seguro qué quieres eliminar este elemento para siempre?";
+    out.fm_removeSeveralDialog = "¿Seguro qué quieres mover estos {0} elementos a la papelera?";
+    out.fm_removeDialog = "¿Seguro qué quieres mover {0} a la papelera?";
+    out.fm_restoreDialog = "¿Seguro que quieres recuperar {0}?";
+    out.fm_unknownFolderError = "La carpeta seleccionada ya no existe. Abriendo la carpeta anterior...";
+    out.fm_contextMenuError = "No se puedo abrir el menú para este elemento. Si persiste el problema, recarga la página.";
+    out.fm_selectError = "No se puedo abrir el elemento. Si persiste el problema, recarga la página.";
+    out.fm_info_root = "Crea carpetas aquí para organizar tus documentos.";
+    out.fm_info_unsorted = "Contiene todos los documentos que has visitado que no estan organizados en \"Documentos\" o movidos a la \"Papelera\".";
+    out.fm_info_template = "Contiene todas las plantillas que puedes volver a usar para crear nuevos documentos.";
+    out.fm_info_allFiles = "Contiene todos los archivos de \"Documentos\", \"Sin organizar\" y \"Papelera\". No puedes mover o eliminar archivos aquí.";
+    out.fm_alert_backupUrl = "Enlace de copia de seguridad para este drive. Te recomendamos <strong>muy fuertemente</strong> que lo guardes secreto.<br>Lo puedes usar para recuparar todos tus archivos en el caso que la memoria de tu navegador se borre.<br>Cualquiera con este enlace puede editar o eliminar todos los archivos en el explorador.<br>";
+    out.fm_backup_title = "Enlace de copia de seguridad";
+    out.fm_nameFile = "¿Cómo quieres nombrar este archivo?";
+    out.fc_newfolder = "Nueva carpeta";
+    out.fc_rename = "Cambiar nombre";
+    out.fc_open = "Abrir";
+    out.fc_open_ro = "Abrir (solo lectura)";
+    out.fc_delete = "Eliminar";
+    out.fc_restore = "Recuperar";
+    out.fc_remove = "Eliminar para siempre";
+    out.fc_empty = "Vaciar la papelera";
+    out.fc_prop = "Propriedades";
+    out.fo_moveUnsortedError = "No puedes mover una carpeta en la lista de documentos no organizados";
+    out.fo_existingNameError = "Nombre ya utilizado en esta carpeta. Por favor elige otro.";
+    out.fo_moveFolderToChildError = "No puedes mover una carpeta en una de sus subcarpetas";
+    out.fo_unableToRestore = "No se pudo restaurar este archivo a la localización de orígen. Puedes intentar moverlo a otra localización.";
+    out.fo_unavailableName = "Un archivo o carpeta ya tiene este nombre. Cambiálo y vuelve a intentarlo.";
+    out.login_login = "Iniciar sesión";
+    out.login_makeAPad = "Crear documento anónimo";
+    out.login_nologin = "Ver documentos locales";
+    out.login_register = "Registrarse";
+    out.logoutButton = "Cerrar sesión";
+    out.settingsButton = "Preferencias";
+    out.login_username = "Nombre de usuario";
+    out.login_password = "Contraseña";
+    out.login_confirm = "Confirmar contraseña";
+    out.login_remember = "Recuérdame";
+    out.login_hashing = "Tratamiento de datos, esto puede tardar un poco.";
+    out.login_hello = "Hola {0},";
+    out.login_helloNoName = "Hola,";
+    out.login_accessDrive = "Acceder a tu drive";
+    out.login_orNoLogin = "o";
+    out.login_noSuchUser = "Credenciales invalidos. Inténtalo de nuevo, o registrate";
+    out.login_invalUser = "Nombre de usuario requirido";
+    out.login_invalPass = "Contraseña requirida";
+    out.login_unhandledError = "Un error inesperado se produjo :(";
+    out.register_importRecent = "Importar historial (recomendado)";
+    out.register_acceptTerms = "Accepto los <a href='/terms.html' tabindex='-1'>términos de servicio</a>";
+    out.register_passwordsDontMatch = "Las contraseñas no corresponden";
+    out.register_mustAcceptTerms = "Tienes que acceptar los términos de servicio";
+    out.register_mustRememberPass = "No podemos reiniciar tu contraseña si la olvidas. ¡Es muy importante que la recuerdes! Marca la casilla para confirmarlo.";
+    out.register_header = "Bienvenido a CryptPad";
+    out.register_explanation = ["<p>Vamos a ver algunas cosas antes</p>", "<ul>", "<li>Tu contraseña es tu clave secreta que cifra todos tus documentos. Si la pierdes no podremos recuparar tus datos.</li>", "<li>Puedes importar documentos que has visto recientemente en tu navegador para tenerlos en tu cuenta.</li>", "<li>Si estás usando un ordenador compartido, tienes que cerrar sesión cuando terminas, cerrar la pestaña no es suficiente.</li>", "</ul>"].join('');
+    out.settings_title = "Preferencias";
+    out.settings_save = "Guardar";
+    out.settings_backupTitle = "Copia de seguridad";
+    out.settings_backup = "Copia de seguridad";
+    out.settings_restore = "Recuparar datos";
+    out.settings_reset = "Quita todos los documentos de tu CryptDrive";
+    out.settings_resetPrompt = "Esta acción eliminará todos tus documentos.<br>¿Seguro que quieres continuar?<br>Introduce “<em>I love CryptPad</em>” para confirmar.";
+    out.settings_resetDone = "¡Tu drive ahora está vacio!";
+    out.settings_resetTips = "Consejos en CryptDrive";
+    out.settings_resetTipsButton = "Restaurar consejos";
+    out.settings_resetTipsDone = "Todos los consejos ahora están visibles";
+    out.main_info = "<h1>Collabora en Confidencia</h1><br>Cultiva ideas juntos con documentos compartidos con tecnología <strong>Zero Knowledge</strong> que protege tu privacidad.";
+    out.main_zeroKnowledge = "Zero Knowledge";
+    out.main_zeroKnowledge_p = "No tienes que confiar que <em>no</em> veremos tus documentos, con la tecnología Zero Knowledge de CryptPad <em>no podemos</em>. Aprende más sobre como protegemos tu <a href=\"/privacy.html\" title='Privacidad'>Privacidad y Seguridad</a>.";
+    out.main_writeItDown = "Escríbelo";
+    out.main_writeItDown_p = "Los mejores proyectos vienen de las más pequeñas ideas. Escribe tus momentos de inspiración y ideas inesperadas porque nunca sabrás cual será tu próximo descubrimiento.";
+    out.main_share = "Comparte el enlace, comparte el pad";
+    out.main_share_p = "Cultiva ideas juntos: ten reuniones eficaces, collabora en listas y haz presentaciones rápidas en todos tus dispositivos.";
+    out.main_organize = "Organizate";
+    out.main_organize_p = "Con CryptPad Drive, porta tu atención en lo más importante. Carpetas te permiten organizar tus proyectos y tener una visión global de donde van las cosas.";
+    out.main_richText = "Editor de Texto Enriquezido";
+    out.main_richText_p = "Collabora en texto enriquezido con nuestro editor Zero Knowledge en tiempo real <a href=\"http://ckeditor.com\" target=\"_blank\">CkEditor</a>.";
+    out.main_code = "Editor de código";
+    out.main_code_p = "Edita código fuente para tus programas con nuestro editor Zero Knowledge en tiempo real <a href=\"https://www.codemirror.net\" target=\"_blank\">CodeMirror</a>.";
+    out.main_slide = "Editor de presentación";
+    out.main_slide_p = "Crea presentaciones utilizando Markdown, y visualizalos en tu navegador";
+    out.main_poll = "Encuestas";
+    out.main_poll_p = "Planifica tus reuniones y eventos, o vota para la mejor solución a un problema.";
+    out.main_drive = "CryptDrive";
+    out.footer_applications = "Applicaciones";
+    out.footer_contact = "Contacto";
+    out.footer_aboutUs = "Acerca de nosotros";
+    out.about = "Acerca de nosotros";
+    out.privacy = "Privacidad";
+    out.contact = "Contacto";
+    out.terms = "Términos de Servicio";
+
+    // 1.1.0 - Bunyip
+    out.movedToTrash = "Este pad fue movido a la papelera.<br><a href\"/drive/\">Acceder a mi Drive</a>";
+    out.fm_newFile = "Nuevo pad";
+    out.fm_type = "Típo";
+    out.fm_categoryError = "No se pudo abrir la categoría seleccionada, mostrando la raíz.";
+    out.settings_userFeedbackHint1 = "CryptPad suministra informaciones muy básicas al servidor, para ayudarnos a mejorar vuestra experiencia.";
+    out.settings_userFeedbackHint2 = "El contenido de tu pad nunca será compartido con el servidor.";
+    out.settings_userFeedback = "Activar feedback";
+    out.settings_anonymous = "No has iniciado sesión. Tus ajustes se aplicarán solo a este navegador.";
+    out.blog = "Blog";
+
+    out.initialState = [
+        '<span style="font-size:18px;"><p>',
+        'Esto es&nbsp;<strong>CryptPad</strong>, el editor collaborativo en tiempo real Zero Knowledge. Todo está guardado cuando escribes.',
+        '<br>',
+        'Comparte el enlace a este pad para editar con amigos o utiliza el botón <span class="fa fa-share-alt" style="border: 1px solid black;color:#000;">&nbsp;Compartir&nbsp;</span> para obtener un <em>enlace solo lectura</em>&nbsp;que permite leer pero no escribir.',
+        '</p>',
+
+        '<p><em>',
+        'Vamos, solo empezia a escribir...',
+        '</em></p></span>',
+        '<p>&nbsp;<br></p>'
+    ].join('');
+
+    out.codeInitialState = "/*\n   Esto es CryptPad, el editor collaborativo en tiempo real zero knowledge.\n   Lo que escribes aquí es cifrado, con lo cual solo las personas con el enlace pueden accederlo.\n   Incluso el servidor no puede ver lo que escribes.\n   Lo que ves aquí, lo que escuchas aquí, cuando sales, se queda aquí\n*/";
+    out.slideInitialState = "# CryptSlide\n* Esto es CryptPad, el editor collaborativo en tiempo real zero knowledge.\n* Lo que escribes aquí es cifrado, con lo cual solo las personas con el enlace pueden accederlo.\n* Incluso el servidor no puede ver lo que escribes.\n* Lo que ves aquí, lo que escuchas aquí, cuando sales, se queda aquí\n\n---\n# Como utilizarlo\n1. Escribe tu contenido en Markdown\n  - Puedes aprender más sobre Markdown [aquí](http://www.markdowntutorial.com/)\n2. Separa tus slides con ---\n3. Haz clic en \"Presentar\" para ver el resultado  - Tus slides se actualizan en tiempo real";
+    out.driveReadmeTitle = "¿Qué es CryptDrive?";
+    out.readme_welcome = "¡Bienvenido a CryptPad!";
+    out.readme_p1 = "Bienvenido a CryptPad, aquí podrás tomar nota de cosas sólo u con otra gente.";
+    out.readme_p2 = "Este pad es un guía rapida para aprender a usar a CryptPad para tomar notas, organizarlas y trabajar con más personas.";
+    out.readme_cat1 = "Aprende a conocer a tu CryptDrive";
+    out.readme_cat1_l1 = "Crea un pad: En CryptDrive, haz clic en {0} y luego en {1} para crear un pad.";
+    out.readme_cat1_l2 = "Abrir pads desde CryptDrive: haz doble clic en un icono para abrirlo.";
+    out.readme_cat1_l3 = "Organiza tus pads: Cuando has iniciado sesión, cada pad que accedes se quedaran en tu drive en {0}.";
+    out.readme_cat1_l3_l1 = "Puedes hacer clic y arrastrar archivos en carpetas desde {0}, y crear nuevas carpetas.";
+    out.readme_cat1_l3_l2 = "Recuerda hacer clic derecho en varios iconos, ya que hay menús addicionales.";
+    out.readme_cat1_l4 = "Elimina tus viejos pads: Haz clic y arrastra tus pads en la {0} de la misma manera que lo harías con carpetas.";
+    out.readme_cat2 = "Haz pads como un pro";
+    out.edit = "editar";
+    out.view = "ver";
+    out.readme_cat2_l1 = "El botón {0} en tu pad te permite dar acceso a collaboradores para {1} o {2} el pad.";
+    out.readme_cat2_l2 = "Cambia el título del pad haciendo clic en el lápiz";
+    out.readme_cat3 = "Descubre las apps CryptPad";
+    out.readme_cat3_l1 = "Con el editor de código CryptPad, puedes collaborar en código fuente, como por ejemplo JavaScript y Markdown";
+    out.readme_cat3_l2 = "Con los slides CryptPad, puedes hacer presentaciones rápidas con Markdown";
+    out.readme_cat3_l3 = "Con CryptPoll puedes tomar votos rápidos, especialmente utíl para programar un horario que conviene a todo el mundo";
+
+    // 1.2.0 - Chupacabra
+
+    out.settings_resetError = "Verificación no válida. Tu CryptDrive no fue cambiado.";
+    out.saved = "Guardado";
+    out.printButton = "Imprimir";
+    out.printButtonTitle = "Imprimir tu presentación o exportar a PDF";
+    out.printOptions = "Opciones de impresión";
+    out.printSlideNumber = "Mostrar el número de diapositiva";
+    out.printDate = "Mostrar la fecha";
+    out.printTitle = "Mostrar el título";
+    out.printCSS = "CSS personalizado:";
+    out.editOpen = "Abrir enlances de edición en pestaña nueva";
+    out.editOpenTitle = "Abrir en modo edición en pestaña nueva";
+    out.settings_importTitle = "Importar pads recientes locales en CryptDrive";
+    out.settings_import = "Importar";
+    out.settings_importConfirm = "¿Seguro qué quieres importar tus pads recientes a tu cuenta CryptDrive?";
+    out.settings_importDone = "Importación terminada";
+
+    out.tips = {};
+    out.tips.lag = "El icono verde en la parte superior derecha muestra la calidad de tu connexión a CryptPad.";
+    out.tips.shortcuts = "`ctrl+b`, `ctrl+i`, y `ctrl+u` son accesos rápidos para negrita, itálica y subrayado.";
+    out.tips.indent = "Cuando editas listas, puedes usar tab o shift+tab para icrementar o decrementar indentación.";
+    out.tips.title = "Puedes cambiar el título de tus pads en la parte superior de la pantalla.";
+    out.tips.store = "Cada vez que visitas un pad con una sesión iniciada se guardará a tu CryptDrive.";
+    out.tips.marker = "Puedes resaltar texto en un pad utilizando el \"marcador\" en el menú de estílo.";
+    out.tips.driveUpload = "Usuarios registrados pueden subir archivos cifrados arrastrandolos hacia CryptDrive.";
+
+    out.feedback_about = "Si estas leyendo esto, quizas estés curioso de saber porqué CryptPad solicita esta página cuando haces algunas acciones";
+    out.feedback_privacy = "Nos importa tu privacidad, y al mismo tiempo queremos que CryptPad sea muy fácil de usar. Utilizamos esta página para conocer las funcionalidades que importan a nuestros usuarios, pidiendolo con un parametro que nos dice que accion fue realizada.";
+    out.feedback_optout = "Si quieres darte de baja, visita <a href='/settings/'>tus preferencias</a>, donde podrás activar o desactivar feedback";
+
+    out.fm_searchName = "Buscar";
+    out.fm_searchPlaceholder = "Buscar...";
+    out.fm_newButtonTitle = "Crear un nuevo pad o carpeta";
+    out.fm_openParent = "Mostrar en carpeta";
+    out.register_writtenPassword = "He escrito mi usuario y contraseña, continuar";
+    out.register_cancel = "Volver";
+    out.register_warning = "Zero Knowledge significa que no podemos recuperar tus datos si pierdes tu contraseña.";
+    out.register_alreadyRegistered = "Este usuario ya existe, ¿iniciar sesión?";
+
+    // 1.4.0 - Easter Bunny
+
+    out.button_newwhiteboard = "Nueva Pizarra";
+    out.wrongApp = "No se pudo mostrar el contenido de la sessión en tiempo real en tu navigador. Por favor, actualiza la página.";
+    out.synced = "Todo está guardado.";
+    out.saveTemplateButton = "Guardar como plantilla";
+    out.saveTemplatePrompt = "Élige un título para la plantilla";
+    out.templateSaved = "¡Plantilla guardada!";
+    out.selectTemplate = "Élige una plantilla o pulsa ESC";
+    out.slideOptionsTitle = "Personaliza tus diapositivas";
+    out.slideOptionsButton = "Guardar (enter)";
+    out.canvas_clear = "Limpiar";
+    out.canvas_delete = "Borrar selección";
+    out.canvas_disable = "No permitir dibujos";
+    out.canvas_enable = "Permitir dibujos";
+    out.canvas_width = "Talla";
+    out.canvas_opacity = "Opacidad";
+    out.settings_publicSigningKey = "Clave de Firma Pública";
+    out.settings_usage = "Utilización";
+    out.settings_usageTitle = "Vee el uso total de tus pads en MB";
+    out.settings_pinningNotAvailable = "Los pads pegados solo están disponibles para usuarios registrados.";
+    out.settings_pinningError = "Algo salió mal";
+    out.settings_usageAmount = "Tus pads pegados utilizan {0}MB";
+    out.historyButton = "Mostrar el historial del documento";
+    out.history_next = "Ir a la versión anterior";
+    out.history_prev = "Ir a la versión posterior";
+    out.history_goTo = "Ir a la versión seleccionada";
+    out.history_close = "Volver";
+    out.history_closeTitle = "Cerrar el historial";
+    out.history_restore = "Restaurar";
+    out.history_restoreTitle = "Restaurar la versión seleccionada del documento";
+    out.history_restorePrompt = "¿Estás seguro que quieres cambiar la versión actual del documento por esta?";
+    out.history_restoreDone = "Documento restaurado";
+    out.fc_sizeInKilobytes = "Talla en Kilobytes";
+
+    // 1.5.0/1.6.0 - Fenrir/Grootslang
+
+    out.deleted = "El pad fue borrado de tu CryptDrive";
+    out.upgrade = "Mejorar";
+    out.upgradeTitle = "Mejora tu cuenta para obtener más espacio";
+    out.upgradeAccount = "Mejorar cuenta";
+
+    out.MB = "MB";
+    out.GB = "GB";
+    out.KB = "KB";
+    out.formattedMB = "{0} MB";
+    out.formattedGB = "{0} GB";
+    out.formattedKB = "{0} KB";
+
+    out.pinLimitReached = "Has llegado al limite de espacio";
+    out.pinLimitNotPinned = "Has llegado al limite de espacio.<br>Este pad no estará presente en tu CryptDrive.";
+    out.pinLimitDrive = "Has llegado al limite de espacio.<br>No puedes crear nuevos pads.";
+    out.printTransition = "Activar transiciones";
+    out.history_version = "Versión: ";
+    out.settings_logoutEverywhereTitle = "Cerrar sessión en todas partes";
+    out.settings_logoutEverywhere = "Cerrar todas las otras sessiones";
+    out.settings_logoutEverywhereConfirm = "¿Estás seguro? Tendrás que volver a iniciar sessión con todos tus dispositivos.";
+    out.upload_serverError = "Error: no pudimos subir tu archivo.";
+    out.upload_uploadPending = "Ya tienes una subida en progreso. ¿Cancelar y subir el nuevo archivo?";
+    out.upload_success = "Tu archivo ({0}) ha sido subido con éxito y fue añadido a tu drive.";
+
+    // 1.7.0 - Hodag
+    out.comingSoon = "Próximamente...";
+    out.newVersion = ["<b>CryptPad ha sido actualizado!</b>",
+        "Puedes ver lo que ha cambiado aquí (en inglés):",
+        "<a href=\"https://github.com/xwiki-labs/cryptpad/releases/tag/{0}\" target=\"_blank\">Notas de versión para CryptPad {0}</a>"].join("<br>");
+    out.pinLimitReachedAlertNoAccounts = "Has llegado a tu limite de espacio";
+    out.previewButtonTitle = "Mostrar/esconder la vista previa Markdown";
+    out.fm_info_anonymous = "No estás conectado, así que estos pads pueden ser borrados (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">¿por qué?</a>). <a href=\"/register/\">Registrate</a> o <a href=\"/login/\">Inicia sesión</a> para asegurarlos.";
+    out.fm_alert_anonymous = "Hola, estás usando CryptPad anónimamente. Está bien, pero tus pads pueden ser borrados después de un périodo de inactividad. Hemos desactivado funciones avanzadas de CryptDrive para usuarios anónimos porque queremos ser claros que no es un lugar seguro para almacenar cosas. Puedes <a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">leer este articulo</a> (en inglés) sobre por qué hacemos esto y por qué deberías <a href=\"/register/\">Registrarte</a> e <a href=\"/login/\">Iniciar sesión</a>.";
+    out.fm_error_cantPin = "Error del servidor. Por favor, recarga la página e intentalo de nuevo.";
+    out.upload_notEnoughSpace = "No tienes suficiente espacio para este archivo en tu CryptDrive";
+    out.upload_tooLarge = "Este archivo supera el límite de carga.";
+    out.upload_choose = "Escoge un archivo";
+    out.upload_pending = "Esperando";
+    out.upload_cancelled = "Cancelado";
+    out.upload_name = "Nombre";
+    out.upload_size = "Tamaño";
+    out.upload_progress = "Progreso";
+    out.download_button = "Descifrar y descargar";
+    out.warn_notPinned = "Este pad no está en ningun CryptDrive. Expirará después de 3 meses. <a href='/about.html#pinning'>Acerca de...</a>";
+
+    out.poll_remove = "Quitar";
+    out.poll_edit = "Editar";
+    out.poll_locked = "Cerrado";
+    out.poll_unlocked = "Abierto";
+
+    out.poll_show_help_button = "Mostrar ayuda";
+    out.poll_hide_help_button = "Esconder ayuda";
+
+    // 1.8.0 - Idopogo
+
+    out.common_connectionLost = "<b>Connexión perdida</b><br>El documento está ahora en modo solo lectura hasta que la conexión vuelva.";
+    out.updated_0_common_connectionLost = out.common_connectionLost;
+    out.supportCryptpad = "Ayudar a CryptPad";
+    out.pinLimitReachedAlert = ["Has llegado a tu limite de espacio. Nuevos pads no serán guardados en tu CryptDrive.",
+        "Puedes eliminar pads de tu CryptDrive o <a href=\"https://accounts.cryptpad.fr/#!on={0}\" target=\"_blank\">suscribirte a una oferta premium</a> para obtener más espacio."].join("<br>");
+    out.updated_0_pinLimitReachedAlert = out.pinLimitReachedAlert;
+    out.fm_info_trash = "Vacía tu papelera para liberar espaci en tu CryptDrive.";
+    out.updated_0_fm_info_trash = out.fm_info_trash;
+
+    out.fs_migration = "Tu CryptDrive fue actualizado a una nueva versión.<br><strong>Por favor, recarga la página.</strong>";
+    out.login_notRegistered = "¿No estás registrado?";
+    out.upload_mustLogin = "Tienes que estar conectado para subir archivos";
+
+    out.uploadButton = "Subir";
+    out.uploadButtonTitle = "Subir un archivo a la carpeta";
+    out.filePickerButton = "Incrustar un archivo";
+    out.filePicker_close = "Cerrar";
+    out.filePicker_description = "Elige un archivo de tu CryptDrive para incrustarlo o sube uno nuevo";
+    out.filePicker_filter = "Filtrar por nombre";
+    out.or = "o";
+    out.languageButton = "Lenguaje";
+    out.languageButtonTitle = "Elige el lenguaje para resaltado de sintaxis";
+    out.themeButton = "Tema";
+    out.themeButtonTitle = "Selecciona el tema de color para los editores de código y presentación";
+    out.canvas_opacityLabel = "Opacidad: {0}";
+    out.canvas_widthLabel = "Talla: {0}";
+
+    // 1.10.0 - Kraken
+
+    out.moreActions = "Más acciones";
+    out.importButton = "Importar";
+    out.exportButton = "Exportar";
+    out.saveTitle = "Guardar título (enter)";
+    out.forgetButton = "Eliminar";
+    out.printText = "Imprimir";
+    out.slideOptionsText = "Opciones";
+    out.historyText = "Historial";
+    out.openLinkInNewTab = "Abrir enlace en pestaña nueva";
+    out.profileButton = "Perfíl";
+    out.profile_urlPlaceholder = "URL";
+    out.profile_namePlaceholder = "Nombre mostrado en su perfíl";
+    out.profile_avatar = "Imágen";
+    out.profile_upload = "Subir una imágen";
+    out.profile_error = "Error al crear tu perfíl: {0}";
+    out.profile_register = "Tienes que registrarte para crear perfíl";
+    out.profile_create = "Crear perfíl";
+    out.profile_description = "Descripción";
+    out.profile_fieldSaved = "Guardado: {0}";
+    out.download_mt_button = "Descargar";
+    out.updated_0_header_logoTitle = "Volver a tu CryptDrive";
+    out.header_logoTitle = out.updated_0_header_logoTitle;
+
+    // 1.11.0 - Lutin
+
+    out.realtime_unrecoverableError = "El motor de tiempo real a encontrado un error. Haga clic en OK para recargar la página.";
+    out.typing = "Escribiendo";
+    out.profile_inviteButton = "Connectar";
+    out.profile_inviteButtonTitle = "Crear un enlace de invitación para este usuario.";
+    out.profile_inviteExplanation = "Hacer clic en <strong>OK</strong> creará un enlace de mensaje seguro que <em>sólo {0} podrá ver.</em><br><br>El enlace será copiado a tu portapapeles y puede ser compartido publicamente.";
+    out.profile_viewMyProfile = "Ver mi perfíl";
+    out.userlist_addAsFriendTitle = 'Agregar "{0}" como contacto';
+    out.userlist_thisIsYou = 'Tú mismo ("{0}")';
+    out.contacts_title = "Contactos";
+    out.contacts_addError = "Error al agregar este contacto a la lista";
+    out.contacts_added = "Invitación acceptada";
+    out.contacts_rejected = "Invitación denegada";
+    out.contacts_request = "<em>{0}</em> quiere agregarte como contacto. <b>Acceptar</b>?";
+    out.contacts_send = "Enviar";
+    out.contacts_remove = "Eliminar este contacto";
+    out.contacts_confirmRemove = "Estás seguro que quieres eliminar <em>{0}</em> de tus contactos?";
+    out.contacts_info1 = "Estos son tus contactos. De aquí, puedes:";
+    out.contacts_info2 = "Hacer clic en el icono de tu contacto para chatear";
+    out.contacts_info3 = "Hacer doble-clic para ver su perfil";
+    out.contacts_info4 = "Cualquier participante puede eliminar definitivamente el historial de chat";
+    out.settings_cat_account = "Cuenta";
+    out.settings_cat_drive = "CryptDrive";
+    out.settings_backupCategory = "Copia de seguridad";
+    out.settings_resetNewTitle = "Limpiar CryptDrive";
+    out.settings_resetButton = "Eliminar";
+    out.settings_resetTipsAction = "Reiniciar";
+    out.settings_userFeedbackTitle = "Feedback";
+    out.settings_logoutEverywhereButton = "Cerar sesión";
+    out.upload_title = "Subir archivo";

    return out;
 });
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@ -1,36 +1,52 @@
 define(function () {
    var out = {};

-    out._languageName = "Français";
-
-    out.main_title = "Cryptpad: Editeur collaboratif en temps réel, zero knowledge";
+    out.main_title = "CryptPad: Éditeur collaboratif en temps réel, zero knowledge";
    out.main_slogan = "L'unité est la force, la collaboration est la clé";

    out.type = {};
-    out.type.pad = 'Pad';
+    out.type.pad = 'Texte';
    out.type.code = 'Code';
    out.type.poll = 'Sondage';
    out.type.slide = 'Présentation';
+    out.type.drive = 'CryptDrive';
+    out.type.whiteboard = "Tableau Blanc";
+    out.type.file = "Fichier";
+    out.type.media = "Média";
+    out.type.contacts = "Contacts";

-    out.errorBox_errorType_disconnected = 'Connexion perdue';
-    out.errorBox_errorExplanation_disconnected = [
-        'La connexion au serveur a été perdue. Vous pouvez essayer de vous reconnecter en rechargeant la page',
-        'ou vous pouvez revoir votre travail en fermant cette boîte de dialogue.',
-    ].join('');
+    out.button_newpad = 'Nouveau document texte';
+    out.button_newcode = 'Nouvelle page de code';
+    out.button_newpoll = 'Nouveau sondage';
+    out.button_newslide = 'Nouvelle présentation';
+    out.button_newwhiteboard = 'Nouveau tableau blanc';

-    out.common_connectionLost = 'Connexion au serveur perdue';
+    out.updated_0_common_connectionLost = "<b>Connexion au serveur perdue</b><br>Vous êtes désormais en mode lecture seule jusqu'au retour de la connexion.";
+    out.common_connectionLost = out.updated_0_common_connectionLost;
+
+    out.websocketError = 'Impossible de se connecter au serveur WebSocket...';
+    out.typeError = "Ce pad n'est pas compatible avec l'application sélectionnée";
+    out.onLogout = 'Vous êtes déconnecté de votre compte utilisateur, <a href="/" target="_blank">cliquez ici</a> pour vous authentifier<br>ou appuyez sur <em>Échap</em> pour accéder au pad en mode lecture seule.';
+    out.wrongApp = "Impossible d'afficher le contenu de ce document temps-réel dans votre navigateur. Vous pouvez essayer de recharger la page.";
+
+    out.loading = "Chargement...";
+    out.error = "Erreur";
+    out.saved = "Enregistré";
+    out.synced = "Tout est enregistré";
+    out.deleted = "Pad supprimé de votre CryptDrive";
+
+    out.realtime_unrecoverableError = "Le moteur temps-réel a rencontré une erreur critique. Cliquez sur OK pour recharger la page.";

    out.disconnected = 'Déconnecté';
    out.synchronizing = 'Synchronisation';
    out.reconnecting = 'Reconnexion...';
+    out.typing = "Édition";
    out.lag = 'Latence';
    out.readonly = 'Lecture seule';
    out.anonymous = "Anonyme";
    out.yourself = "Vous-même";
-    out.anonymousUsers = "utilisateurs anonymes";
-    out.anonymousUser = "utilisateur anonyme";
-    out.shareView = "URL de lecture seule";
-    out.shareEdit = "URL d'édition";
+    out.anonymousUsers = "éditeurs anonymes";
+    out.anonymousUser = "éditeur anonyme";
    out.users = "Utilisateurs";
    out.and = "Et";
    out.viewer = "lecteur";
@ -38,80 +54,143 @@ define(function () {
    out.editor = "éditeur";
    out.editors = "éditeurs";

+    out.language = "Langue";
+
+    out.comingSoon = "Bientôt disponible...";
+
+    out.newVersion = '<b>CryptPad a été mis à jour !</b><br>' +
+                     'Découvrez les nouveautés de la dernière version :<br>'+
+                     '<a href="https://github.com/xwiki-labs/cryptpad/releases/tag/{0}" target="_blank">Notes de version pour CryptPad {0}</a>';
+
+    out.upgrade = "Augmenter votre limite";
+    out.upgradeTitle = "Améliorer votre compte pour augmenter la limite de stockage";
+
+    out.upgradeAccount = "Améliorer le compte";
+    out.MB = "Mo";
+    out.GB = "Go";
+    out.KB = "Ko";
+
+    out.supportCryptpad = "Soutenir CryptPad";
+
+    out.formattedMB = "{0} Mo";
+    out.formattedGB = "{0} Go";
+    out.formattedKB = "{0} Ko";
+
    out.greenLight = "Tout fonctionne bien";
    out.orangeLight = "Votre connexion est lente, ce qui réduit la qualité de l'éditeur";
-    out.redLight = "Vous êtes déconnectés de la session";
+    out.redLight = "Vous êtes déconnecté de la session";

-    out.importButton = 'IMPORTER';
-    out.importButtonTitle = 'Importer un document depuis un fichier local';
+    out.pinLimitReached = "Vous avez atteint votre limite de stockage";
+    out.updated_0_pinLimitReachedAlert = "Vous avez atteint votre limite de stockage. Les nouveaux pads ne seront pas enregistrés dans votre CryptDrive.<br>" +
+        'Vous pouvez soit supprimer des pads de votre CryptDrive, soit vous <a href="https://accounts.cryptpad.fr/#!on={0}" target="_blank">abonner à une offre premium</a> pour augmenter la limite maximale.';
+    out.pinLimitReachedAlert = out.updated_0_pinLimitReachedAlert;
+    out.pinLimitReachedAlertNoAccounts = out.pinLimitReached;
+    out.pinLimitNotPinned = "Vous avez atteint votre limite de stockage.<br>"+
+                            "Ce pad n'est pas enregistré dans votre CryptDrive.";
+    out.pinLimitDrive = out.pinLimitReached+ ".<br>" +
+                        "Vous ne pouvez pas créer de nouveaux pads.";

-    out.exportButton = 'EXPORTER';
-    out.exportButtonTitle = 'Exporter ce document vers un fichier local';
+    out.moreActions = "Autres actions";
+
+    out.importButton = "Importer";
+    out.importButtonTitle = 'Importer un pad depuis un fichier local';
+
+    out.exportButton = "Exporter";
+    out.exportButtonTitle = 'Exporter ce pad vers un fichier local';
    out.exportPrompt = 'Comment souhaitez-vous nommer ce fichier ?';

-    out.back = '&#8656; Retour';
-    out.backToCryptpad = '⇐ Retour vers Cryptpad';
-
-    out.userButton = 'UTILISATEUR';
-    out.userButtonTitle = "Changer votre nom d'utilisateur";
    out.changeNamePrompt = 'Changer votre nom (laisser vide pour rester anonyme) : ';
+    out.user_rename = "Changer le nom affiché";
+    out.user_displayName = "Nom affiché";
+    out.user_accountName = "Nom d'utilisateur";

-    out.renameButton = 'RENOMMER';
-    out.renameButtonTitle = 'Changer le titre utilisé par ce document dans la page d\'accueil de Cryptpad';
-    out.renamePrompt = 'Quel titre souhaitez-vous utiliser pour ce document ?';
-    out.renameConflict = 'Un autre document existe déjà avec le même titre';
    out.clickToEdit = 'Cliquer pour modifier';
+    out.saveTitle = "Enregistrer le titre (Entrée)";

-    out.forgetButton = 'OUBLIER';
-    out.forgetButtonTitle = 'Enlever ce document de la liste en page d\'accueil';
-    out.forgetPrompt = 'Cliquer sur OK supprimera l\'URL de ce document de la mémoire de votre navigateur (localStorage), êtes-vous sûr ?';
+    out.forgetButton = "Supprimer";
+    out.forgetButtonTitle = 'Déplacer ce pad vers la corbeille';
+    out.forgetPrompt = 'Cliquer sur OK déplacera ce pad vers la corbeille de votre CryptDrive, êtes-vous sûr ?';
+    out.movedToTrash = 'Ce pad a été déplacé vers la corbeille.<br><a href="/drive/">Accéder à mon Drive</a>';

    out.shareButton = 'Partager';
-    out.shareButtonTitle = "Copier l'URL dans le presse-papiers";
-    out.shareSuccess = 'URL copiée dans le presse-papiers';
-    out.shareFailed = "Échec de la copie de l'URL dans le presse-papiers";
+    out.shareSuccess = 'Lien copié dans le presse-papiers';
+
+    out.newButton = 'Nouveau';
+    out.newButtonTitle = 'Créer un nouveau pad';
+    out.uploadButton = 'Importer des fichiers';
+    out.uploadButtonTitle = 'Importer un nouveau fichier dans le dossier actuel';
+
+    out.saveTemplateButton = "Sauver en tant que modèle";
+    out.saveTemplatePrompt = "Choisir un titre pour ce modèle";
+    out.templateSaved = "Modèle enregistré !";
+    out.selectTemplate = "Sélectionner un modèle ou appuyer sur Échap";
+
+    out.previewButtonTitle = "Afficher ou cacher la prévisualisation de Markdown";

-    out.presentButton = 'PRÉSENTER';
    out.presentButtonTitle = "Entrer en mode présentation";
    out.presentSuccess = 'Appuyer sur Échap pour quitter le mode présentation';
-    out.sourceButton = 'VOIR LA SOURCE';
-    out.sourceButtonTitle = "Quitter le mode présentation";

-    out.backgroundButton = 'COULEUR DE FOND';
    out.backgroundButtonTitle = 'Changer la couleur de fond de la présentation';
-    out.colorButton = 'COULEUR DU TEXTE';
    out.colorButtonTitle = 'Changer la couleur du texte en mode présentation';

-    out.commitButton = 'VALIDER';
+    out.printText = "Imprimer";
+    out.printButton = "Imprimer (Entrée)";
+    out.printButtonTitle = "Imprimer votre présentation ou l'enregistrer au format PDF";
+    out.printOptions = "Options de mise en page";
+    out.printSlideNumber = "Afficher le numéro des slides";
+    out.printDate = "Afficher la date";
+    out.printTitle = "Afficher le titre du pad";
+    out.printCSS = "Personnaliser l'apparence (CSS):";
+    out.printTransition = "Activer les animations de transition";

-    out.getViewButton = 'LECTURE SEULE';
-    out.getViewButtonTitle = "Obtenir l'adresse d'accès à ce document en lecture seule";
-    out.readonlyUrl = 'Document en lecture seule';
-    out.copyReadOnly = "Copier l'URL dans le presse-papiers";
-    out.openReadOnly = "Ouvrir dans un nouvel onglet";
-    out.editShare = "Partager l'URL d'édition";
-    out.editShareTitle = "Copier l'URL d'édition dans le presse-papiers";
-    out.viewShare = "Partager l'URL de lecture";
-    out.viewShareTitle = "Copier l'URL d'accès en lecture seule dans le presse-papiers";
+    out.filePickerButton = "Intégrer un fichier";
+    out.filePicker_close = "Fermer";
+    out.filePicker_description = "Choisissez un fichier de votre CryptDrive pour l'intégrer ou uploadez-en un nouveau";
+    out.filePicker_filter = "Filtrez les fichiers par leur nom";
+    out.or = 'ou';
+
+    out.slideOptionsText = "Options";
+    out.slideOptionsTitle = "Personnaliser la présentation";
+    out.slideOptionsButton = "Enregistrer (Entrée)";
+
+    out.languageButton = "Langage";
+    out.languageButtonTitle = "Sélectionner le langage à utiliser pour la coloration syntaxique";
+    out.themeButton = "Thème";
+    out.themeButtonTitle = "Sélectionner le thème de couleurs à utiliser pour les éditeurs de code et de présentations";
+
+    out.editShare = "Lien d'édition";
+    out.editShareTitle = "Copier le lien d'édition dans le presse-papiers";
+    out.editOpen = "Éditer dans un nouvel onglet";
+    out.editOpenTitle = "Ouvrir le lien d'édition dans un nouvel onglet";
+    out.viewShare = "Lien de lecture-seule";
+    out.viewShareTitle = "Copier lien d'accès en lecture seule dans le presse-papiers";
    out.viewOpen = "Voir dans un nouvel onglet";
-    out.viewOpenTitle = "Ouvrir le document en lecture seule dans un nouvel onglet";
+    out.viewOpenTitle = "Ouvrir le lien en lecture seule dans un nouvel onglet";

    out.notifyJoined = "{0} a rejoint la session collaborative";
    out.notifyRenamed = "{0} a changé son nom en {1}";
    out.notifyLeft = "{0} a quitté la session collaborative";

-    out.disconnectAlert = 'Perte de la connexion au réseau !';
-
-    out.tryIt = 'Essayez-le !';
-    out.recentPads = 'Vos documents récents (stockés uniquement dans votre navigateur)';
-
    out.okButton = 'OK (Entrée)';
+
+    out.cancel = "Annuler";
    out.cancelButton = 'Annuler (Echap)';

-    out.loginText = '<p>Votre nom d\'utilisateur et votre mot de passe sont utilisés pour générer une clé unique qui reste inconnue de notre serveur.</p>\n' +
-                    '<p>Faites attention de ne pas oublier vos identifiants puisqu\'ils seront impossible à récupérer.</p>';
+    out.historyText = "Historique";
+    out.historyButton = "Afficher l'historique du document";
+    out.history_next = "Voir la version suivante";
+    out.history_prev = "Voir la version précédente";
+    out.history_goTo = "Voir la version sélectionnée";
+    out.history_close = "Retour";
+    out.history_closeTitle = "Fermer l'historique";
+    out.history_restore = "Restaurer";
+    out.history_restoreTitle = "Restaurer la version du document sélectionnée";
+    out.history_restorePrompt = "Êtes-vous sûr de vouloir remplacer la version actuelle du document par la version affichée ?";
+    out.history_restoreDone = "Document restauré";
+    out.history_version = "Version :";

-    out.forget = "Oublier";
+    // Ckeditor links
+    out.openLinkInNewTab = "Ouvrir le lien dans un nouvel onglet";

    // Polls

@ -119,16 +198,18 @@ define(function () {
    out.poll_subtitle = "Planification de rendez-vous et sondages en <em>temps-réel</em> et Zero Knowledge";

    out.poll_p_save = "Vos modifications sont mises à jour instantanément, donc vous n'avez jamais besoin de sauver le contenu.";
-    out.poll_p_encryption = "Tout ce que vous entrez est crypté donc seules les personnes possédant le lien du sondage y ont accès. Même le serveur ne peut pas voir le contenu.";
-    out.poll_p_howtouse = "Entrez votre nom dans le champ ci-dessous et cochez les cases lorsque les options vous conviennent.";
+    out.poll_p_encryption = "Tout ce que vous entrez est chiffré donc seules les personnes possédant le lien du sondage y ont accès. Même le serveur ne peut pas voir le contenu.";

-    out.promptName = "Quel est votre nom ?";
-
-    out.wizardButton = 'ASSISTANT';
    out.wizardLog = "Cliquez sur le bouton dans le coin supérieur gauche pour retourner au sondage";
    out.wizardTitle = "Utiliser l'assistant pour créer votre sondage";
    out.wizardConfirm = "Êtes-vous vraiment prêt à ajouter ces options au sondage ?";

+    out.poll_publish_button = "Publier";
+    out.poll_admin_button = "Administrer";
+    out.poll_create_user = "Ajouter un utilisateur";
+    out.poll_create_option = "Ajouter une option";
+    out.poll_commit = "Valider";
+
    out.poll_closeWizardButton = "Fermer l'assistant";
    out.poll_closeWizardButtonTitle = "Fermer l'assistant";
    out.poll_wizardComputeButton = "Générer les options";
@ -137,86 +218,408 @@ define(function () {
    out.poll_wizardAddDateButton = "+ Dates";
    out.poll_wizardAddTimeButton = "+ Horaires";

-    out.poll_addUserButton = "+ Utilisateurs";
-    out.poll_addUserButtonTitle = "Cliquer pour ajouter un utilisateur";
-    out.poll_addOptionButton = "+ Options";
-    out.poll_addOptionButtonTitle = "Cliquer pour ajouter une option";
-    out.poll_addOption = "Indiquer la nouvelle option";
    out.poll_optionPlaceholder = "Option";
-    out.poll_addUser = "Entrer un nom";
    out.poll_userPlaceholder = "Votre nom";
    out.poll_removeOption = "Êtes-vous sûr de vouloir supprimer cette option ?";
-    out.poll_removeOptionTitle = "Supprimer la ligne";
    out.poll_removeUser = "Êtes-vous sûr de vouloir supprimer cet utilisateur ?";
-    out.poll_removeUserTitle = "Supprimer la colonne";
-    out.poll_editOption = "Êtes-vous sûr de vouloir éditer cette option ?";
-    out.poll_editOptionTitle = "Éditer la ligne";
-    out.poll_editUser = "Êtes-vous sûr de vouloir éditer les choix de cet utilisateur ?";
-    out.poll_editUserTitle = "Éditer la colonne";

    out.poll_titleHint = "Titre";
    out.poll_descriptionHint = "Description";

+    out.poll_remove = "Supprimer";
+    out.poll_edit = "Modifier";
+    out.poll_locked = "Verrouillé";
+    out.poll_unlocked = "Déverrouillé";
+
+    out.poll_show_help_button = "Afficher l'aide";
+    out.poll_hide_help_button = "Cacher l'aide";
+
+    // Canvas
+    out.canvas_clear = "Nettoyer";
+    out.canvas_delete = "Supprimer la sélection";
+    out.canvas_disable = "Désactiver le dessin";
+    out.canvas_enable = "Activer le dessin";
+    out.canvas_width = "Épaisseur";
+    out.canvas_opacity = "Opacité";
+    out.canvas_opacityLabel = "opacité: {0}";
+    out.canvas_widthLabel = "taille: {0}";
+
+    // Profile
+    out.profileButton = "Profil"; // dropdown menu
+    out.profile_urlPlaceholder = 'URL';
+    out.profile_namePlaceholder = 'Nom ou pseudo pour le profil';
+    out.profile_avatar = "Avatar";
+    out.profile_upload = " Importer un nouvel avatar";
+    out.profile_error = "Erreur lors de la création du profil : {0}";
+    out.profile_register = "Vous devez vous inscrire pour pouvoir créer un profil !";
+    out.profile_create = "Créer un profil";
+    out.profile_description = "Description";
+    out.profile_fieldSaved = 'Nouvelle valeur enregistrée: {0}';
+
+    out.profile_viewMyProfile = "Voir mon profil";
+
+    // contacts/userlist
+    out.userlist_addAsFriendTitle = 'Ajouter "{0}" comme contact';
+    out.userlist_thisIsYou = 'Vous ("{0}")';
+    out.contacts_title = "Contacts";
+    out.contacts_addError = "Erreur lors de l'ajout de ce contact dans votre liste";
+    out.contacts_added = 'Invitation de contact acceptée';
+    out.contacts_rejected = 'Invitation d econtact rejetée';
+    out.contacts_request = '<em>{0}</em> souhaite vous ajouter en tant que contact. <b>Accepter<b> ?';
+    out.contacts_send = 'Envoyer';
+    out.contacts_remove = 'Supprimer ce contact';
+    out.contacts_confirmRemove = 'Êtes-vous sûr de voulour supprimer <em>{0}</em> de vos contacts ?';
+
+
+    out.contacts_info1 = "Voici vos contacts. Ici, vous pouvez :";
+    out.contacts_info2 = "Cliquer sur le nom d'un contact pour discuter avec lui";
+    out.contacts_info3 = "Double-cliquer sur son nom pour voir son profil";
+    out.contacts_info4 = "Chaque participant peut nettoyer définitivement l'historique d'une discussion";
+
+    // File manager
+
+    out.fm_rootName = "Documents";
+    out.fm_trashName = "Corbeille";
+    out.fm_unsortedName = "Fichiers non triés";
+    out.fm_filesDataName = "Tous les fichiers";
+    out.fm_templateName = "Modèles";
+    out.fm_searchName = "Recherche";
+    out.fm_searchPlaceholder = "Rechercher...";
+    out.fm_newButton = "Nouveau";
+    out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier, importer un fichier dans le dossier courant";
+    out.fm_newFolder = "Nouveau dossier";
+    out.fm_newFile = "Nouveau pad";
+    out.fm_folder = "Dossier";
+    out.fm_folderName = "Nom du dossier";
+    out.fm_numberOfFolders = "# de dossiers";
+    out.fm_numberOfFiles = "# de fichiers";
+    out.fm_fileName = "Nom du fichier";
+    out.fm_title = "Titre";
+    out.fm_type = "Type";
+    out.fm_lastAccess = "Dernier accès";
+    out.fm_creation = "Création";
+    out.fm_forbidden = "Action interdite";
+    out.fm_originalPath = "Chemin d'origine";
+    out.fm_openParent = "Montrer dans le dossier";
+    out.fm_noname = "Document sans titre";
+    out.fm_emptyTrashDialog = "Êtes-vous sûr de vouloir vider la corbeille ?";
+    out.fm_removeSeveralPermanentlyDialog = "Êtes-vous sûr de vouloir supprimer ces {0} éléments de manière permanente ?";
+    out.fm_removePermanentlyDialog = "Êtes-vous sûr de vouloir supprimer cet élément de manière permanente ?";
+    out.fm_restoreDialog = "Êtes-vous sûr de vouloir restaurer {0} à son emplacement précédent ?";
+    out.fm_removeSeveralDialog = "Êtes-vous sûr de vouloir déplacer ces {0} éléments vers la corbeille ?";
+    out.fm_removeDialog = "Êtes-vous sûr de vouloir déplacer {0} vers la corbeille ?";
+    out.fm_unknownFolderError = "Le dossier sélectionné ou le dernier dossier visité n'existe plus. Ouverture du dossier parent...";
+    out.fm_contextMenuError = "Impossible d'ouvrir le menu contextuel pour cet élément. Si le problème persiste, essayez de rechercher la page.";
+    out.fm_selectError = "Impossible de sélectionner l'élément ciblé. Si le problème persiste, essayez de recharger la page.";
+    out.fm_categoryError = "Impossible d'afficher la catégorie sélectionnée, affichage de Documents";
+    out.fm_info_root = "Créez ici autant de dossiers que vous le souhaitez pour trier vos fichiers.";
+    out.fm_info_unsorted = 'Contient tous les pads que vous avez ouvert et qui ne sont pas triés dans "Documents" ou déplacés vers la "Corbeille".'; // "My Documents" should match with the "out.fm_rootName" key, and "Trash" with "out.fm_trashName"
+    out.fm_info_template = "Contient tous les fichiers que vous avez sauvés en tant que modèle afin de les réutiliser lors de la création d'un nouveau pad.";
+    out.updated_0_fm_info_trash = "Vider la corbeille permet de libérer de l'espace dans votre CryptDrive";
+    out.fm_info_trash = out.updated_0_fm_info_trash;
+    out.fm_info_allFiles = 'Contient tous les fichiers de "Documents", "Fichiers non triés" et "Corbeille". Vous ne pouvez pas supprimer ou déplacer des fichiers depuis cet endroit.'; // Same here
+    out.fm_info_anonymous = 'Vous n\'êtes pas connecté, ces pads risquent donc d\'être supprimés (<a href="https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/" target="_blank">découvrez pourquoi</a>). ' +
+                            '<a href="/register/">Inscrivez-vous</a> ou <a href="/login/">connectez-vous</a> pour les maintenir en vie.';
+    out.fm_alert_backupUrl = "Lien de secours pour ce CryptDrive.<br>" +
+                             "Il est <strong>fortement recommandé</strong> de garder ce lien pour vous-même.<br>" +
+                             "Il vous servira en cas de perte des données de votre navigateur afin de retrouver vos fichiers.<br>" +
+                             "Quiconque se trouve en possession de celui-ci peut modifier ou supprimer tous les fichiers de ce gestionnaire.<br>";
+    out.fm_alert_anonymous = "Bonjour ! Vous utilisez actuellement Cryptpad de manière anonyme, ce qui ne pose pas de problème mais vos pads peuvent être supprimés après un certain temps " +
+                             "d'inactivité. Nous avons désactivé certaines fonctionnalités avancées de CryptDrive pour les utilisateurs anonymes afin de rendre clair le fait que ce n'est pas " +
+                             'un endroit sûr pour le stockage des documents. Vous pouvez <a href="https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/" target="_blank">en lire plus</a> concernant ' +
+                             'nos raisons pour ces changements et pourquoi vous devriez vraiment <a href="/register/">vous enregistrer</a> et <a href="/login/">vous connecter</a>.';
+    out.fm_backup_title = 'Lien de secours';
+    out.fm_nameFile = 'Comment souhaitez-vous nommer ce fichier ?';
+    out.fm_error_cantPin = "Erreur interne du serveur. Veuillez recharger la page et essayer de nouveau.";
+    // File - Context menu
+    out.fc_newfolder = "Nouveau dossier";
+    out.fc_rename = "Renommer";
+    out.fc_open = "Ouvrir";
+    out.fc_open_ro = "Ouvrir (lecture seule)";
+    out.fc_delete = "Supprimer";
+    out.fc_restore = "Restaurer";
+    out.fc_remove = "Supprimer définitivement";
+    out.fc_empty = "Vider la corbeille";
+    out.fc_prop = "Propriétés";
+    out.fc_sizeInKilobytes = "Taille en kilo-octets";
+    // fileObject.js (logs)
+    out.fo_moveUnsortedError = "La liste des éléments non triés ne peut pas contenir de dossiers.";
+    out.fo_existingNameError = "Ce nom est déjà utilisé dans ce répertoire. Veuillez en choisir un autre.";
+    out.fo_moveFolderToChildError = "Vous ne pouvez pas déplacer un dossier dans un de ses descendants";
+    out.fo_unableToRestore = "Impossible de restaurer ce fichier à son emplacement d'origine. Vous pouvez essayer de le déplacer à un nouvel emplacement.";
+    out.fo_unavailableName = "Un fichier ou dossier avec le même nom existe déjà au nouvel emplacement. Renommez cet élément avant d'essayer à nouveau.";
+
+    out.fs_migration = "Votre CryptDrive est en train d'être mis à jour vers une nouvelle version. Cela implique que cette page doive être rechargée.<br><strong>Veuillez recharger la page pour pouvoir continuer à l'utiliser.</<strong>";
+
+    // login
+    out.login_login = "Connexion";
+    out.login_makeAPad = 'Créer un pad anonymement';
+    out.login_nologin = "Voir les pads récents";
+    out.login_register = "Inscription";
+    out.logoutButton = "Déconnexion";
+    out.settingsButton = "Préférences";
+
+    out.login_username = "Nom d'utilisateur";
+    out.login_password = "Mot de passe";
+    out.login_confirm = "Confirmer votre mot de passe";
+    out.login_remember = "Se souvenir de moi";
+
+    out.login_hashing = "Traitement de vos identifiants, cela peut nécessiter quelques instants.";
+
+    out.login_hello = 'Bonjour {0},'; // {0} is the username
+    out.login_helloNoName = 'Bonjour,';
+    out.login_accessDrive = 'Accédez à votre drive';
+    out.login_orNoLogin = 'ou';
+
+    out.login_noSuchUser = "Nom d'utilisateur ou mot de passe invalide. Veuillez vous inscrire ou réessayer.";
+    out.login_invalUser = "Nom d'utilisateur requis";
+    out.login_invalPass = 'Mot de passe requis';
+    out.login_unhandledError = "Une erreur inattendue s'est produite :(";
+
+    out.login_notRegistered = 'Pas encore inscrit ?';
+
+    out.register_importRecent = "Importer l'historique (Recommendé)";
+    out.register_acceptTerms = "J'accepte <a href='/terms.html' tabindex='-1'>les conditions d'utilisation</a>";
+    out.register_passwordsDontMatch = "Les mots de passe doivent être identiques!";
+    out.register_mustAcceptTerms = "Vous devez accepter les conditions d'utilisation.";
+    out.register_mustRememberPass = "Nous ne pouvons pas réinitialiser votre mot de passe si vous l'oubliez. C'est important que vous vous en souveniez! Veuillez cocher la case pour confirmer.";
+    out.register_writtenPassword = "J'ai bien noté mon nom d'utilisateur et mon mot de passe, continuer";
+    out.register_cancel = "Retour";
+    out.register_warning = "Zero Knowledge signifie que nous ne pouvons pas récupérer vos données si vous perdez vos identifiants.";
+    out.register_alreadyRegistered = "Cet utilisateur existe déjà, souhaitez-vous vous connecter ?";
+
+    out.register_header = "Bienvenue dans CryptPad";
+    out.register_explanation = [
+        "<p>Faisons d'abord le point sur certaines choses</p>",
+        "<ul>",
+            "<li>Votre mot de passe est la clé secrète de tous vos pads. Si vous le perdez, il n'y a aucun moyen de récupérer vos données.</li>",
+            "<li>Vous pouvez importer les pads récents de ce navigateur pour les avoir dans votre compte utilisateur.</li>",
+            "<li>Si vous utilisez un ordinateur partagé, vous devez vous déconnecter avant de partir, fermer l'onglet n'est pas suffisant.</li>",
+        "</ul>"
+    ];
+
+    // Settings
+    out.settings_cat_account = "Compte";
+    out.settings_cat_drive = "CryptDrive";
+    out.settings_title = "Préférences";
+    out.settings_save = "Sauver";
+
+    out.settings_backupCategory = "Sauvegarde";
+    out.settings_backupTitle = "Créer ou restaurer une sauvegarde de vos données";
+    out.settings_backup = "Sauvegarder";
+    out.settings_restore = "Restaurer";
+
+    out.settings_resetNewTitle = "Vider CryptDrive";
+    out.settings_resetButton = "Supprimer";
+    out.settings_reset = "Supprimer tous les fichiers et dossiers de votre CryptDrive";
+    out.settings_resetPrompt = "Cette action va supprimer tous les pads de votre drive.<br>"+
+                               "Êtes-vous sûr de vouloir continuer ?<br>" +
+                               "Tapez “<em>I love CryptPad</em>” pour confirmer.";
+    out.settings_resetDone = "Votre drive est désormais vide!";
+    out.settings_resetError = "Texte de vérification incorrect. Votre CryptDrive n'a pas été modifié.";
+
+    out.settings_resetTipsAction  ="Réinitialiser";
+    out.settings_resetTips = "Astuces";
+    out.settings_resetTipsButton = "Réinitialiser les astuces visibles dans CryptDrive";
+    out.settings_resetTipsDone = "Toutes les astuces sont de nouveau visibles.";
+
+    out.settings_importTitle = "Importer les pads récents de ce navigateur dans votre CryptDrive";
+    out.settings_import = "Importer";
+    out.settings_importConfirm = "Êtes-vous sûr de vouloir importer les pads récents de ce navigateur dans le CryptDrive de votre compte utilisateur ?";
+    out.settings_importDone = "Importation terminée";
+
+    out.settings_userFeedbackTitle = "Retour d'expérience";
+    out.settings_userFeedbackHint1 = "CryptPad peut envoyer des retours d'expérience très limités vers le serveur, de manière à nous permettre d'améliorer l'expérience des utilisateurs. ";
+    out.settings_userFeedbackHint2 = "Le contenu de vos pads et les clés de déchiffrement ne seront jamais partagés avec le serveur.";
+    out.settings_userFeedback = "Activer l'envoi de retours d'expérience";
+
+    out.settings_anonymous = "Vous n'êtes pas connectés. Ces préférences seront utilisées pour ce navigateur.";
+    out.settings_publicSigningKey = "Clé publique de signature";
+
+    out.settings_usage = "Utilisation";
+    out.settings_usageTitle = "Voir la taille totale de vos pads épinglés en Mo";
+    out.settings_pinningNotAvailable = "Les pads épinglés sont disponibles uniquement pour les utilisateurs enregistrés.";
+    out.settings_pinningError = "Un problème est survenu";
+    out.settings_usageAmount = "Vos pads épinglés occupent {0} Mo";
+
+    out.settings_logoutEverywhereButton = "Se déconnecter";
+    out.settings_logoutEverywhereTitle = "Se déconnecter partout";
+    out.settings_logoutEverywhere = "Se déconnecter de force de toutes les autres sessions.";
+    out.settings_logoutEverywhereConfirm = "Êtes-vous sûr ? Vous devrez vous reconnecter sur tous vos autres appareils.";
+
+    out.upload_title = "Hébergement de fichiers";
+    out.upload_serverError = "Erreur interne: impossible d'importer le fichier pour l'instant.";
+    out.upload_uploadPending = "Vous avez déjà un fichier en cours d'importation. Souhaitez-vous l'annuler et importer ce nouveau fichier ?";
+    out.upload_success = "Votre fichier ({0}) a été importé avec succès et ajouté à votre CryptDrive.";
+    out.upload_notEnoughSpace = "Il n'y a pas assez d'espace libre dans votre CryptDrive pour ce fichier.";
+    out.upload_tooLarge = "Ce fichier dépasse la taille maximale autorisée.";
+    out.upload_choose = "Choisir un fichier";
+    out.upload_pending = "En attente";
+    out.upload_cancelled = "Annulé";
+    out.upload_name = "Nom du fichier";
+    out.upload_size = "Taille";
+    out.upload_progress = "État";
+    out.upload_mustLogin = "Vous devez vous connecter pour importer un fichier";
+    out.download_button = "Déchiffrer et télécharger";
+    out.download_mt_button = "Télécharger";
+
+    // general warnings
+    out.warn_notPinned = "Ce pad n'est stocké dans aucun CryptDrive. Il va expirer après 3 mois d'inactivité. <a href='/about.html#pinning'>En savoir plus...</a>";
+
    // index.html

-    out.main_p1 = 'CryptPad est l\'éditeur collaboratif en temps réel <strong>zero knowledge</strong>. Le chiffrement est effectué depuis votre navigateur, ce qui protège les données contre le serveur, le cloud, et la NSA. La clé de chiffrement est stockée dans l\'<a href="https://fr.wikipedia.org/wiki/Identificateur_de_fragment">identifieur de fragment</a> de l\'URL qui n\'est jamais envoyée au serveur mais est accessible depuis javascript, de sorte qu\'en partageant l\'URL, vous donnez l\'accès au pad à ceux qui souhaitent participer.';
+    //about.html
    out.main_p2 = 'Ce projet utilise l\'éditeur visuel (WYSIWYG) <a href="http://ckeditor.com/">CKEditor</a>, l\'éditeur de code source <a href="https://codemirror.net/">CodeMirror</a>, et le moteur temps-réel <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a>.';
-    out.main_howitworks = 'Comment ça fonctionne';
    out.main_howitworks_p1 = 'CryptPad utilise une variante de l\'algorithme d\'<a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> qui est capable de trouver un consensus distribué en utilisant <a href="https://bitcoin.org/bitcoin.pdf">une chaîne de bloc Nakamoto</a>, un outil popularisé par le <a href="https://fr.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. De cette manière, l\'algorithme évite la nécessité d\'utiliser un serveur central pour résoudre les conflits d\'édition de l\'Operational Transformation, et sans ce besoin de résolution des conflits le serveur peut rester ignorant du contenu qui est édité dans le pad.';
-    out.main_about = 'À propos';
-    out.main_about_p1 = 'Vous pouvez en apprendre davantage sur notre <a href="/privacy.html" title="">politique de confidentialité</a> et nos <a href="/terms.html">conditions d\'utilisation</a>.';
+    //contact.html
    out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez <a href="https://twitter.com/cryptpad">nous tweeter</a>, ouvrir une issue sur <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">Github</a>, venir dire bonjour sur IRC (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), ou <a href="mailto:research@xwiki.com">nous envoyer un email</a>.';

-    out.table_type = 'Type';
-    out.table_link = 'Lien';
-    out.table_created = 'Créé le';
-    out.table_last = 'Dernier accès';
+    out.main_info = "<h2>Collaborez avec confiance</h2><br>Développez vos idées en groupe avec des document partagés; la technologie <strong>Zero Knowledge</strong> sécurise vos données.";

-    out.button_newpad = 'CRÉER UN PAD WYSIWYG';
-    out.button_newcode = 'CRÉER UN PAD DE CODE';
-    out.button_newpoll = 'CRÉER UN SONDAGE';
-    out.button_newslide = 'CRÉER UNE PRÉSENTATION';
+    out.main_howitworks = 'Comment ça fonctionne';
+    out.main_zeroKnowledge = 'Zero Knowledge';
+    out.main_zeroKnowledge_p = "Vous n'avez pas besoin de croire que nous n'<em>allons</em> pas regarder vos pads. Avec la technologie Zero Knowledge de CryptPad, nous ne <em>pouvons</em> pas le faire. Apprenez-en plus sur notre manière de <a href=\"privacy.html\" title='Protection des données'>protéger vos données</a>.";
+    out.main_writeItDown = 'Prenez-en note';
+    out.main_writeItDown_p = "Les plus grands projets naissent des plus petites idées. Prenez note de vos moments d'inspiration et de vos idées inattendues car vous ne savez pas lesquels seront des découvertes capitales.";
+    out.main_share = 'Partagez le lien, partagez le pad';
+    out.main_share_p = "Faites croître vos idées à plusieurs : réalisez des réunions efficaces, collaborez sur vos listes de tâches et réalisez des présentations rapides avec tous vos amis sur tous vos appareils.";
+    out.main_organize = 'Soyez organisé';
+    out.main_organize_p = "Avec CryptDrive, vous pouvez garder vos vues sur ce qui est important. Les dossiers vous permettent de garder la trace de vos projets et d'avoir une vision globale du travail effectué.";
+    out.tryIt = 'Essayez-le !';
+    out.main_richText = 'Éditeur de texte';
+    out.main_richText_p = 'Éditez des documents texte collaborativement avec notre application <a href="http://ckeditor.com" target="_blank">CkEditor</a> temps-réel et Zero Knowledge.';
+    out.main_code = 'Éditeur de code';
+    out.main_code_p = 'Modifiez votre code collaborativement grâce à notre application <a href="https://www.codemirror.net" target="_blank">CodeMirror</a> temps-réel et Zero Knowledge.';
+    out.main_slide = 'Présentations';
+    out.main_slide_p = 'Créez vos présentations en syntaxe Markdown collaborativement de manière sécurisée et affichez les dans votre navigateur.';
+    out.main_poll = 'Sondages';
+    out.main_poll_p = 'Plannifiez vos réunions ou évènements, ou votez pour la meilleure solution concernant votre problème.';
+    out.main_drive = 'CryptDrive';
+
+    out.footer_applications = "Applications";
+    out.footer_contact = "Contact";
+    out.footer_aboutUs = "À propos";
+
+    out.about = "À propos";
+    out.privacy = "Vie privée";
+    out.contact = "Contact";
+    out.terms = "Conditions";
+    out.blog = "Blog";

    // privacy.html

-    out.policy_title = 'Politique de confidentialité de Cryptpad';
+    out.policy_title = 'Politique de confidentialité de CryptPad';
    out.policy_whatweknow = 'Ce que nous savons de vous';
-    out.policy_whatweknow_p1 = 'En tant qu\'application hébergée sur le web, Cryptpad a accès aux meta-données exposées par le protocole HTTP. Ceci inclus votre adresse IP et d\'autres en-têtes HTTP qui peuvent être utilisées pour identifier votre propre navigateur. Vous pouvez voir quelles informations votre navigateur partage en visitant <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>.';
-    out.policy_whatweknow_p2 = 'Nous utilisons <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, une plateforme open source d\'analytique, afin d\'en apprendre plus sur nos utilisateurs. Piwik nous indique comment vous avez trouvé Cryptpad, que ce soit par une entrée directe, par un moteur de recherche ou depuis un lien provenant d\'un autre site web tel que Reddit ou Twitter. Nous savons également quand vous visitez le site, sur quels liens vous cliquez dans les pages informatives et combien de temps vous restez sur une page donnée.';
-    out.policy_whatweknow_p3 = 'Ces outils d\'analytique sont utilisés uniquement sur les pages informatives. Nous ne collectons aucune information concernant votre utilisation de nos applications "zero knowledge".';
+    out.policy_whatweknow_p1 = 'En tant qu\'application hébergée sur le web, CryptPad a accès aux meta-données exposées par le protocole HTTP. Ceci inclus votre adresse IP et d\'autres en-têtes HTTP qui peuvent être utilisées pour identifier votre propre navigateur. Vous pouvez voir quelles informations votre navigateur partage en visitant <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>.';
+    out.policy_whatweknow_p2 = 'Nous utilisons <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, une plateforme open source d\'analytique, afin d\'en apprendre plus sur nos utilisateurs. Piwik nous indique comment vous avez trouvé CryptPad, que ce soit par une entrée directe, par un moteur de recherche ou depuis un lien provenant d\'un autre site web tel que Reddit ou Twitter. Nous savons également quand vous visitez le site, sur quels liens vous cliquez dans les pages informatives et combien de temps vous restez sur une page donnée.';
    out.policy_howweuse = 'Comment nous utilisons ce que nous apprenons';
-    out.policy_howweuse_p1 = 'Nous utilisons ces informations pour prendre de meilleures décisions concernant la communication autour de Cryptpad, en évaluant le succès de ce qui a été realisé par le passé. Les informations concernant votre localisation nous permettent de savoir si nous devons considérer l\'ajout de traductions de Cryptpad dans d\'autres langues que l\'anglais.';
+    out.policy_howweuse_p1 = 'Nous utilisons ces informations pour prendre de meilleures décisions concernant la communication autour de CryptPad, en évaluant le succès de ce qui a été realisé par le passé. Les informations concernant votre localisation nous permettent de savoir si nous devons considérer l\'ajout de traductions de CryptPad dans d\'autres langues que l\'anglais.';
    out.policy_howweuse_p2 = "Les informations concernant votre navigateur (que ce soit un système d\'exploitation de bureau ou d\'appareil portable) nous aident à prendre des décisions lors de la priorisation des ajouts et améliorations de fonctionnalités. Notre équipe de développement est petite, et nous essayons de prendre des décisions qui amélioreront l\'expérience du plus grand nombre d\'utilisateurs possible.";
    out.policy_whatwetell = 'Ce que nous dévoilons à d\'autres à propos de vous';
    out.policy_whatwetell_p1 = 'Nous ne fournissons aucune information que nous récoltons ou que vous nous fournissez à des tierces parties à moins d\'y être contraints par la loi.';
    out.policy_links = 'Liens vers d\'autres sites';
-    out.policy_links_p1 = 'Ce site contient des liens vers d\'autres sites, certains étant produits par d\'autres organisations. Nous ne sommes responsables des pratiques de confidentialité ou du contenu d\'aucun site externe. De manière générale, les liens vers des sites externes sont lancés dans une nouvelle fenêtre (ou onglet) du navigateur, pour rendre clair le fait que vous quittez Cryptpad.fr.';
+    out.policy_links_p1 = 'Ce site contient des liens vers d\'autres sites, certains étant produits par d\'autres organisations. Nous ne sommes responsables des pratiques de confidentialité ou du contenu d\'aucun site externe. De manière générale, les liens vers des sites externes sont lancés dans une nouvelle fenêtre (ou onglet) du navigateur, pour rendre clair le fait que vous quittez CryptpPad.fr.';
    out.policy_ads = 'Publicité';
    out.policy_ads_p1 = 'Nous n\'affichons pas de publicité en ligne, bien que nous puissions afficher des liens vers les sites des organisations qui financent nos recherches.';
    out.policy_choices = 'Vos choix';
-    out.policy_choices_open = 'Notre code est open source, ce qui signifie que vous avez toujours la possibilité d\'héberger votre propre instance de Cryptpad.';
-    out.policy_choices_vpn = 'Si vous souhaitez utiliser notre instance hébergée (cryptpad.fr) mais que vous ne souhaitez pas exposer votre adresse IP, vous pouvez la protéger en utilisant le <a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads from the Tor project" target="_blank" rel="noopener noreferrer">navigateur Tor</a>, ou un <a href="https://riseup.net/fr/vpn" title="VPNs provided by Riseup" target="_blank" rel="noopener noreferrer">VPN</a>.';
-    out.policy_choices_ads = 'Si vous souhaitez uniquement bloquer notre plateforme d\'analytique, vous pouvez utiliser un bloqueur de publicités tel que <a href="https://www.eff.org/fr/privacybadger" title="download privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';
+    out.policy_choices_open = 'Notre code est open source, ce qui signifie que vous avez toujours la possibilité d\'héberger votre propre instance de CryptPad.';
+    out.policy_choices_vpn = 'Si vous souhaitez utiliser notre instance hébergée (cryptpad.fr) mais que vous ne souhaitez pas exposer votre adresse IP, vous pouvez la protéger en utilisant le <a href="https://www.torproject.org/projects/torbrowser.html.en" title="téléchargements du projet Tor" target="_blank" rel="noopener noreferrer">navigateur Tor</a>, ou un <a href="https://riseup.net/fr/vpn" title="VPNs fournis par Riseup" target="_blank" rel="noopener noreferrer">VPN</a>.';
+    out.policy_choices_ads = 'Si vous souhaitez uniquement bloquer notre plateforme d\'analytique, vous pouvez utiliser un bloqueur de publicités tel que <a href="https://www.eff.org/fr/privacybadger" title="télécharger privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';

    // terms.html

-    out.tos_title = "Conditions d'utilisation de Cryptpad";
+    out.tos_title = "Conditions d'utilisation de CryptPad";
    out.tos_legal = "Veuillez ne pas être malveillant, abusif, ou faire quoi que ce soit d'illégal.";
    out.tos_availability = "Nous espérons que vous trouvez ce service utile, mais nous ne pouvons garantir ses performances et disponibilités. Nous vous recommandons d'exporter vos données régurlièrement.";
-    out.tos_e2ee = "Les document sur Cryptpad peuvent être lus et modifiés par quiconque est en mesure de deviner ou d'obtenir de quelque manière que ce soit l'identificateur de fragment (hash) du document. Nous vous recommandons d'utiliser des technologies de messagerie chiffrées de bout à bout (end-to-end encryption ou e2ee) pour partager les URLs, et déclinons toute responsabilité dans le cas ou une telle URL serait divulguée.";
+    out.tos_e2ee = "Le contenu sur CryptPad peuvent être lus et modifiés par quiconque est en mesure de deviner ou d'obtenir de quelque manière que ce soit l'identificateur de fragment du pad. Nous vous recommandons d'utiliser des technologies de messagerie chiffrées de bout à bout (end-to-end encryption ou e2ee) pour partager les liens, et déclinons toute responsabilité dans le cas ou un tel lien serait divulgué.";
    out.tos_logs = "Les meta-données fournies par votre navigateur au serveur peuvent être enregistrées dans le but de maintenir le service.";
    out.tos_3rdparties = "Nous ne fournissons aucune donnée individuelle à des tierces parties à moins d'y être contraints par la loi.";

    // BottomBar.html

-    out.bottom_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" /> en <img class="bottom-bar-fr" src="/customize/fr.png" /></a>';
+    out.bottom_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" alt="amour" /> en <img class="bottom-bar-fr" src="/customize/fr.png" alt="France" /></a>';
    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">Un projet <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs</a> avec le soutien de <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';

    // Header.html

-    out.header_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" /> en <img class="bottom-bar-fr" title="France" alt="France" src="/customize/fr.png" /> par <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+    out.header_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" alt="amour" /> en <img class="bottom-bar-fr" title="France" alt="France" src="/customize/fr.png" /> par <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
    out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
-    out.header_logoTitle = "Aller vers la page d'accueil";
+    out.updated_0_header_logoTitle = 'Retourner vers votre CryptDrive';
+    out.header_logoTitle = out.updated_0_header_logoTitle;
+
+    // Initial states
+
+    out.initialState = [
+        '<span style="font-size:16px;"><p>',
+        'Voici <strong>CryptPad</strong>, l\'éditeur collaboratif en temps-réel Zero Knowledge. Tout est sauvegardé dés que vous le tapez.',
+        '<br>',
+        'Partagez le lien vers ce pad avec des amis ou utilisez le bouton <span class="fa fa-share-alt" style="border: 1px solid black;color:#000;">&nbsp;Partager&nbsp;</span> pour obtenir le <em>lien de lecture-seule</em>, qui permet la lecture mais non la modification.',
+        '</p>',
+        '<p>',
+        '<em>',
+        'Lancez-vous, commencez à taper...',
+        '</em></p></span>',
+        '<p>&nbsp;<br></p>'
+    ].join('');
+
+    out.codeInitialState = [
+        '# Éditeur de code collaboratif et Zero Knowledge de CryptPad\n',
+        '\n',
+        '* Ce que vous tapez ici est chiffré de manière que seules les personnes avec le lien peuvent y accéder.\n',
+        '* Vous pouvez choisir le langage de programmation pour la coloration syntaxique, ainsi que le thème de couleurs, dans le coin supérieur droit.'
+    ].join('');
+
+    out.slideInitialState = [
+        '# CryptSlide\n',
+        '* Voici CryptPad, l\'éditeur collaboratif en temps-réel Zero Knowledge.\n',
+        '* Ce que vous tapez ici est chiffré de manière que seules les personnes avec le lien peuvent y accéder.\n',
+        '* Même le serveur est incapable de voir ce que vous tapez.\n',
+        '* Ce que vous voyez ici, ce que vous entendez, quand vous partez, ça reste ici.\n',
+        '\n',
+        '---',
+        '\n',
+        '# Comment l\'utiliser\n',
+        '1. Écrivez le contenu de votre présentation avec la syntaxe Markdown\n',
+        '  - Apprenez à utiliser markdown en cliquant [ici](http://www.markdowntutorial.com/)\n',
+        '2. Séparez vos slides avec ---\n',
+        '3. Cliquez sur la bouton "lecture" pour afficher le résultat en mode présentation',
+        '  - La présentation est mise à jour en temps-réel'
+    ].join('');
+
+    out.driveReadmeTitle = "Qu'est-ce que CryptDrive ?";
+    out.readme_welcome = "Bienvenue dans CryptPad !";
+    out.readme_p1 = "Bienvenue dans CryptPad, le lieu où vous pouvez prendre des notes seul ou avec des amis.";
+    out.readme_p2 = "Ce pad va vous donner un aperçu de la manière dont vous pouvez utiliser CryptPad pour prendre des notes, les organiser et travailler en groupe sur celles-ci.";
+    out.readme_cat1 = "Découvrez votre CryptDrive";
+    out.readme_cat1_l1 = "Créer un pad : Dans votre CryptDrive, cliquez sur {0} puis {1} et vous obtenez un nouveau pad."; // 0: New, 1: Rich Text
+    out.readme_cat1_l2 = "Ouvrir des pads depuis votre CryptDrive : Double-cliquez sur l'icone d'un pad pour l'ouvrir.";
+    out.readme_cat1_l3 = "Organiser vos pads : Quand vous êtes connectés, tous les pads auquel vous accédez sont ajoutés dans la section {0} de votre CryptDrive."; // 0: Unsorted files
+    out.readme_cat1_l3_l1 = "Vous pouvez cliquer et faire glisser des fichiers dans des dossiers dans la section {0} de votre CryptDrive, et créer de nouveaux dossiers."; // 0: Documents
+    out.readme_cat1_l3_l2 = "N'hésitez pas à utiliser le clic droit sur les icones puisque des menus sont souvent disponibles.";
+    out.readme_cat1_l4 = "Déplacer des pads vers la corbeille : Vous pouvez cliquer et faire glisser vos pads dans la {0} de la même manière que vous pouvez les déposer dans des dossiers."; // 0: Trash
+    out.readme_cat2 = "Créer des pads comme un pro";
+    out.edit = "éditer";
+    out.view = "voir";
+    out.readme_cat2_l1 = "Le bouton {0} dans votre pad vous permet de donner l'accès à vos collaborateurs que ce soit pour l'{1} ou pour le {2}."; // 0: Share, 1: edit, 2: view
+    out.readme_cat2_l2 = "Vous pouvez changer le titre d'un pad en cliquant sur le crayon";
+    out.readme_cat3 = "Découvrez les autres applications CryptPad";
+    out.readme_cat3_l1 = "Avec l'éditeur de code de CryptPad, vous pouvez collaborer sur du code comme Javascript ou des langages comme HTML ou Markdown.";
+    out.readme_cat3_l2 = "Avec l'éditeur de présentations de CryptPad, vous pouvez réaliser des présentations rapides en utilisant Markdown";
+    out.readme_cat3_l3 = "Avec CryptPoll vous pouvez créer rapidement des sondages, et en particulier plannifier des meetings qui rentrent dans l'agenda de tout ceux qui souhaitent participer.";
+
+    // Tips
+    out.tips = {};
+    out.tips.lag = "L'icône verte dans le coin supérieur droit montre la qualité de votre connexion Internet vers le serveur CryptPad.";
+    out.tips.shortcuts = "`ctrl+b`, `ctrl+i` et `ctrl+u` sont des raccourcis rapides pour mettre en gras, en italique ou souligner.";
+    out.tips.indent = "Dans les listes à puces ou numérotées, vous pouvez utiliser `Tab` ou `Maj+Tab` pour augmenter ou réduire rapidement l'indentation.";
+    out.tips.title = "Vous pouvez changer le titre de votre pad en cliquant au centre en haut de la page.";
+    out.tips.store = "Dés que vous ouvrez un nouveau pad, il est automatiquement stocké dans votre CryptDrive si vous êtes connectés.";
+    out.tips.marker = "Vous pouvez surligner du texte dans un pad en utilisant l'option \"marker\" dans le menu déroulant des styles.";
+    out.tips.driveUpload = "Les utilisateurs enregistrés peuvent importer des fichiers en les faisant glisser et en les déposant dans leur CryptDrive.";
+
+    out.feedback_about = "Si vous lisez ceci, vous vous demandez probablement pourquoi CryptPad envoie des requêtes vers des pages web quand vous realisez certaines actions.";
+    out.feedback_privacy = "Nous prenons au sérieux le respect de votre vie privée, et en même temps nous souhaitons rendre CryptPad très simple à utiliser. Nous utilisons cette page pour comprendre quelles fonctionnalités dans l'interface comptent le plus pour les utilisateurs, en l'appelant avec un paramètre spécifiant quelle action a été réalisée.";
+    out.feedback_optout = "Si vous le souhaitez, vous pouvez désactiver ces requêtes en vous rendant dans <a href='/settings/'>votre page de préférences</a>, où vous trouverez une case à cocher pour désactiver le retour d'expérience.";

    return out;
 });
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@ -1,38 +1,54 @@
 define(function () {
    var out = {};

-    // translations must set this key for their language to be available in
-    // the language dropdowns that are shown throughout Cryptpad's interface
-    out._languageName = 'English';
-
-    out.main_title = "Cryptpad: Zero Knowledge, Collaborative Real Time Editing";
-    out.main_slogan = "Unity is Strength - Collaboration is Key";
+    out.main_title = "CryptPad: Zero Knowledge, Collaborative Real Time Editing";
+    out.main_slogan = "Unity is Strength - Collaboration is Key"; // TODO remove?

    out.type = {};
-    out.type.pad = 'Pad';
+    out.type.pad = 'Rich text';
    out.type.code = 'Code';
    out.type.poll = 'Poll';
    out.type.slide = 'Presentation';
+    out.type.drive = 'CryptDrive';
+    out.type.whiteboard = 'Whiteboard';
+    out.type.file = 'File';
+    out.type.media = 'Media';
+    out.type.contacts = 'Contacts';

-    out.errorBox_errorType_disconnected = 'Connection Lost';
-    out.errorBox_errorExplanation_disconnected = [
-        'Lost connection to server, you may reconnect by reloading the page or review your work ',
-        'by clicking outside of this box.'
-    ].join('');
+    out.button_newpad = 'New Rich Text pad';
+    out.button_newcode = 'New Code pad';
+    out.button_newpoll = 'New Poll';
+    out.button_newslide = 'New Presentation';
+    out.button_newwhiteboard = 'New Whiteboard';

-    out.common_connectionLost = 'Server Connection Lost';
+    // 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_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 = "This pad is not compatible with the selected application";
+    out.onLogout = 'You are logged out, <a href="/" target="_blank">click here</a> to log in<br>or press <em>Escape</em> to access your pad in read-only mode.';
+    out.wrongApp = "Unable to display the content of that realtime session in your browser. Please try to reload that page.";
+
+    out.loading = "Loading...";
+    out.error = "Error";
+    out.saved = "Saved";
+    out.synced = "Everything is saved";
+    out.deleted = "Pad deleted from your CryptDrive";
+
+    out.realtime_unrecoverableError = "The realtime engine has encountered an unrecoverable error. Click OK to reload.";

    out.disconnected = 'Disconnected';
    out.synchronizing = 'Synchronizing';
    out.reconnecting = 'Reconnecting...';
+    out.typing = "Typing";
    out.lag = 'Lag';
    out.readonly = 'Read only';
    out.anonymous = "Anonymous";
    out.yourself = "Yourself";
-    out.anonymousUsers = "anonymous users";
-    out.anonymousUser = "anonymous user";
-    out.shareView = "Read-only URL";
-    out.shareEdit = "Edit URL";
+    out.anonymousUsers = "anonymous editors";
+    out.anonymousUser = "anonymous editor";
    out.users = "Users";
    out.and = "And";
    out.viewer = "viewer";
@ -40,80 +56,143 @@ define(function () {
    out.editor = "editor";
    out.editors = "editors";

+    out.language = "Language";
+
+    out.comingSoon = "Coming soon...";
+
+    out.newVersion = '<b>CryptPad has been updated!</b><br>' +
+                     'Check out what\'s new in the latest version:<br>'+
+                     '<a href="https://github.com/xwiki-labs/cryptpad/releases/tag/{0}" target="_blank">Release notes for CryptPad {0}</a>';
+
+    out.upgrade = "Upgrade";
+    out.upgradeTitle = "Upgrade your account to increase the storage limit";
+
+    out.upgradeAccount = "Upgrade account";
+    out.MB = "MB";
+    out.GB = "GB";
+    out.KB = "KB";
+
+    out.supportCryptpad = "Support CryptPad";
+
+    out.formattedMB = "{0} MB";
+    out.formattedGB = "{0} GB";
+    out.formattedKB = "{0} KB";
+
    out.greenLight = "Everything is working fine";
    out.orangeLight = "Your slow connection may impact your experience";
    out.redLight = "You are disconnected from the session";

-    out.importButton = 'IMPORT';
-    out.importButtonTitle = 'Import a document from a local file';
+    out.pinLimitReached = "You've reached your storage limit";
+    out.updated_0_pinLimitReachedAlert = "You've reached your storage limit. New pads won't be stored in your CryptDrive.<br>" +
+        'You can either remove pads from your CryptDrive or <a href="https://accounts.cryptpad.fr/#!on={0}" target="_blank">subscribe to a premium offer</a> to increase your limit.';
+    out.pinLimitReachedAlert = out.updated_0_pinLimitReachedAlert;
+    out.pinLimitReachedAlertNoAccounts = out.pinLimitReached;
+    out.pinLimitNotPinned = "You've reached your storage limit.<br>"+
+                            "This pad is not stored in your CryptDrive.";
+    out.pinLimitDrive = "You've reached your storage limit.<br>" +
+                        "You can't create new pads.";

-    out.exportButton = 'EXPORT';
-    out.exportButtonTitle = 'Export this document to a local file';
+    out.moreActions = "More actions";
+
+    out.importButton = "Import";
+    out.importButtonTitle = 'Import a pad from a local file';
+
+    out.exportButton = "Export";
+    out.exportButtonTitle = 'Export this pad to a local file';
    out.exportPrompt = 'What would you like to name your file?';

-    out.back = '&#8656; Back';
-    out.backToCryptpad = '⇐ Back to Cryptpad';
-
-    out.userButton = 'USER';
-    out.userButtonTitle = 'Change your username';
    out.changeNamePrompt = 'Change your name (leave empty to be anonymous): ';
+    out.user_rename = "Change display name";
+    out.user_displayName = "Display name";
+    out.user_accountName = "Account name";

-    out.renameButton = 'RENAME';
-    out.renameButtonTitle = 'Change the title under which this document is listed on your home page';
-    out.renamePrompt = 'How would you like to title this pad?';
-    out.renameConflict = 'Another pad already has that title';
    out.clickToEdit = "Click to edit";
+    out.saveTitle = "Save the title (enter)";

-    out.forgetButton = 'FORGET';
-    out.forgetButtonTitle = 'Remove this document from your home page listings';
-    out.forgetPrompt = 'Clicking OK will remove the URL for this pad from localStorage, are you sure?';
+    out.forgetButton = "Delete";
+    out.forgetButtonTitle = 'Move this pad to the trash';
+    out.forgetPrompt = 'Clicking OK will move this pad to your trash. Are you sure?';
+    out.movedToTrash = 'That pad has been moved to the trash.<br><a href="/drive/">Access my Drive</a>';

    out.shareButton = 'Share';
-    out.shareButtonTitle = "Copy URL to clipboard";
-    out.shareSuccess = 'Copied URL to clipboard';
-    out.shareFailed = "Failed to copy URL to clipboard";
+    out.shareSuccess = 'Copied link to clipboard';
+
+    out.newButton = 'New';
+    out.newButtonTitle = 'Create a new pad';
+    out.uploadButton = 'Upload files';
+    out.uploadButtonTitle = 'Upload a new file to the current folder';
+
+    out.saveTemplateButton = "Save as template";
+    out.saveTemplatePrompt = "Choose a title for the template";
+    out.templateSaved = "Template saved!";
+    out.selectTemplate = "Select a template or press escape";
+
+    out.previewButtonTitle = "Display or hide the Markdown preview mode";

-    out.presentButton = 'PRESENT';
    out.presentButtonTitle = "Enter presentation mode";
    out.presentSuccess = 'Hit ESC to exit presentation mode';
-    out.sourceButton = 'VIEW SOURCE';
-    out.sourceButtonTitle = "Leave presentation mode";

-    out.backgroundButton = 'BACKGROUND COLOR';
    out.backgroundButtonTitle = 'Change the background color in the presentation';
-    out.colorButton = 'TEXT COLOR';
    out.colorButtonTitle = 'Change the text color in presentation mode';

-    out.commitButton = 'COMMIT';
+    out.printText = "Print";
+    out.printButton = "Print (enter)";
+    out.printButtonTitle = "Print your slides or export them as a PDF file";
+    out.printOptions = "Layout options";
+    out.printSlideNumber = "Display the slide number";
+    out.printDate = "Display the date";
+    out.printTitle = "Display the pad title";
+    out.printCSS = "Custom style rules (CSS):";
+    out.printTransition = "Enable transition animations";

-    out.getViewButton = 'READ-ONLY URL';
-    out.getViewButtonTitle = 'Get the read-only URL for this document';
-    out.readonlyUrl = 'Read only document';
-    out.copyReadOnly = "Copy URL to clipboard";
-    out.openReadOnly = "Open in a new tab";
-    out.editShare = "Share edit URL";
-    out.editShareTitle = "Copy the edit URL to clipboard";
-    out.viewShare = "Share view URL";
-    out.viewShareTitle = "Copy the read-only URL to clipboard";
-    out.viewOpen = "View in new tab";
-    out.viewOpenTitle = "Open the document in read-only mode in a new tab";
+    out.filePickerButton = "Embed a file";
+    out.filePicker_close = "Close";
+    out.filePicker_description = "Choose a file from your CryptDrive to embed it or upload a new one";
+    out.filePicker_filter = "Filter files by name";
+    out.or = 'or';
+
+    out.slideOptionsText = "Options";
+    out.slideOptionsTitle = "Customize your slides";
+    out.slideOptionsButton = "Save (enter)";
+
+    out.languageButton = "Language";
+    out.languageButtonTitle = "Select the language to use for the syntax highlighting";
+    out.themeButton = "Theme";
+    out.themeButtonTitle = "Select the color theme to use for the code and slide editors";
+
+    out.editShare = "Editing link";
+    out.editShareTitle = "Copy the editing link to clipboard";
+    out.editOpen = "Open editing link in a new tab";
+    out.editOpenTitle = "Open this pad in editing mode in a new tab";
+    out.viewShare = "Read-only link";
+    out.viewShareTitle = "Copy the read-only link to clipboard";
+    out.viewOpen = "Open read-only link in a new tab";
+    out.viewOpenTitle = "Open this pad in read-only mode in a new tab";

    out.notifyJoined = "{0} has joined the collaborative session";
    out.notifyRenamed = "{0} is now known as {1}";
    out.notifyLeft = "{0} has left the collaborative session";

-    out.disconnectAlert = 'Network connection lost!';
-
-    out.tryIt = 'Try it out!';
-    out.recentPads = 'Your recent pads (stored only in your browser)';
-
    out.okButton = 'OK (enter)';
+
+    out.cancel = "Cancel";
    out.cancelButton = 'Cancel (esc)';

-    out.loginText = '<p>Your username and password are used to generate a unique key which is never known by our server.</p>\n' +
-                    '<p>Be careful not to forget your credentials, as they are impossible to recover</p>';
+    out.historyText = "History";
+    out.historyButton = "Display the document history";
+    out.history_next = "Go to the next version";
+    out.history_prev = "Go to the previous version";
+    out.history_goTo = "Go to the selected version";
+    out.history_close = "Back";
+    out.history_closeTitle = "Close the history";
+    out.history_restore = "Restore";
+    out.history_restoreTitle = "Restore the selected version of the document";
+    out.history_restorePrompt = "Are you sure you want to replace the current version of the document by the displayed one?";
+    out.history_restoreDone = "Document restored";
+    out.history_version = "Version:";

-    out.forget = "Forget";
+    // Ckeditor links
+    out.openLinkInNewTab = "Open Link in New Tab";

    // Polls

@ -122,15 +201,17 @@ define(function () {

    out.poll_p_save = "Your settings are updated instantly, so you never need to save.";
    out.poll_p_encryption = "All your input is encrypted so only people who have the link can access it. Even the server cannot see what you change.";
-    out.poll_p_howtouse = "Enter your name in the input field below and check the box for times when you are available";

-    out.promptName = "What is you name ?";
-
-    out.wizardButton = 'WIZARD';
    out.wizardLog = "Click the button in the top left to return to your poll";
    out.wizardTitle = "Use the wizard to create your poll";
    out.wizardConfirm = "Are you really ready to add these options to your poll?";

+    out.poll_publish_button = "Publish";
+    out.poll_admin_button = "Admin";
+    out.poll_create_user = "Add a new user";
+    out.poll_create_option = "Add a new option";
+    out.poll_commit = "Commit";
+
    out.poll_closeWizardButton = "Close wizard";
    out.poll_closeWizardButtonTitle = "Close wizard";
    out.poll_wizardComputeButton = "Compute Options";
@ -139,91 +220,420 @@ define(function () {
    out.poll_wizardAddDateButton = "+ Dates";
    out.poll_wizardAddTimeButton = "+ Times";

-    out.poll_addUserButton = "+ Users";
-    out.poll_addUserButtonTitle = "Click to add a user";
-    out.poll_addOptionButton = "+ Options";
-    out.poll_addOptionButtonTitle = "Click to add an option";
-    out.poll_addOption = "Propose an option";
    out.poll_optionPlaceholder = "Option";
-    out.poll_addUser = "Enter a name";
    out.poll_userPlaceholder = "Your name";
    out.poll_removeOption = "Are you sure you'd like to remove this option?";
-    out.poll_removeOptionTitle = "Remove the row";
    out.poll_removeUser = "Are you sure you'd like to remove this user?";
-    out.poll_removeUserTitle = "Remove the column";
-    out.poll_editOption = "Are you sure you'd like to edit this option?";
-    out.poll_editOptionTitle = "Edit the row";
-    out.poll_editUser = "Are you sure you'd like to edit this user?";
-    out.poll_editUserTitle = "Edit the column";

    out.poll_titleHint = "Title";
-    out.poll_descriptionHint = "Description";
+    out.poll_descriptionHint = "Describe your poll, and use the 'publish' button when you're done. Anyone with the link can change the description, but this is discouraged.";
+
+    out.poll_remove = "Remove";
+    out.poll_edit = "Edit";
+    out.poll_locked = "Locked";
+    out.poll_unlocked = "Unlocked";
+
+    out.poll_show_help_button = "Show help";
+    out.poll_hide_help_button = "Hide help";
+
+    // Canvas
+    out.canvas_clear = "Clear";
+    out.canvas_delete = "Delete selection";
+    out.canvas_disable = "Disable draw";
+    out.canvas_enable = "Enable draw";
+    out.canvas_width = "Width";
+    out.canvas_opacity = "Opacity";
+    out.canvas_opacityLabel = "opacity: {0}";
+    out.canvas_widthLabel = "Width: {0}";
+
+    // Profile
+    out.profileButton = "Profile"; // dropdown menu
+    out.profile_urlPlaceholder = 'URL';
+    out.profile_namePlaceholder = 'Name displayed in your profile';
+    out.profile_avatar = "Avatar";
+    out.profile_upload = " Upload a new avatar";
+    out.profile_error = "Error while creating your profile: {0}";
+    out.profile_register = "You have to sign up to create a profile!";
+    out.profile_create = "Create a profile";
+    out.profile_description = "Description";
+    out.profile_fieldSaved = 'New value saved: {0}';
+
+    out.profile_inviteButton = "Connect";
+    out.profile_inviteButtonTitle ='Create a link that will invite this user to connect with you.';
+    out.profile_inviteExplanation = "Clicking <strong>OK</strong> will create a link to a secure messaging session that <em>only {0} will be able to redeem.</em><br><br>The link will be copied to your clipboard and can be shared publicly.";
+    out.profile_viewMyProfile = "View my profile";
+
+    // contacts/userlist
+    out.userlist_addAsFriendTitle = 'Add "{0}" as a contact';
+    out.userlist_thisIsYou = 'This is you ("{0}")';
+    out.contacts_title = "Contacts";
+    out.contacts_addError = 'Error while adding that contact to the list';
+    out.contacts_added = 'Contact invite accepted.';
+    out.contacts_rejected = 'Contact invite rejected';
+    out.contacts_request = '<em>{0}</em> would like to add you as a contact. <b>Accept<b>?';
+    out.contacts_send = 'Send';
+    out.contacts_remove = 'Remove this contact';
+    out.contacts_confirmRemove = 'Are you sure you want to remove <em>{0}</em> from your contacts?';
+
+
+    out.contacts_info1 = "These are your contacts. From here, you can:";
+    out.contacts_info2 = "Click your contact's icon to chat with them";
+    out.contacts_info3 = "Double-click their icon to view their profile";
+    out.contacts_info4 = "Either participant can clear permanently a chat history";
+
+    // File manager
+
+    out.fm_rootName = "Documents";
+    out.fm_trashName = "Trash";
+    out.fm_unsortedName = "Unsorted files";
+    out.fm_filesDataName = "All files";
+    out.fm_templateName = "Templates";
+    out.fm_searchName = "Search";
+    out.fm_searchPlaceholder = "Search...";
+    out.fm_newButton = "New";
+    out.fm_newButtonTitle = "Create a new pad or folder, import a file in the current folder";
+    out.fm_newFolder = "New folder";
+    out.fm_newFile = "New pad";
+    out.fm_folder = "Folder";
+    out.fm_folderName = "Folder name";
+    out.fm_numberOfFolders = "# of folders";
+    out.fm_numberOfFiles = "# of files";
+    out.fm_fileName = "File name";
+    out.fm_title = "Title";
+    out.fm_type = "Type";
+    out.fm_lastAccess = "Last access";
+    out.fm_creation = "Creation";
+    out.fm_forbidden = "Forbidden action";
+    out.fm_originalPath = "Original path";
+    out.fm_openParent = "Show in folder";
+    out.fm_noname = "Untitled Document";
+    out.fm_emptyTrashDialog = "Are you sure you want to empty the trash?";
+    out.fm_removeSeveralPermanentlyDialog = "Are you sure you want to remove these {0} elements from the trash permanently?";
+    out.fm_removePermanentlyDialog = "Are you sure you want to remove that element permanently?";
+    out.fm_removeSeveralDialog = "Are you sure you want to move these {0} elements to the trash?";
+    out.fm_removeDialog = "Are you sure you want to move {0} to the trash?";
+    out.fm_restoreDialog = "Are you sure you want to restore {0} to its previous location?";
+    out.fm_unknownFolderError = "The selected or last visited directory no longer exist. Opening the parent folder...";
+    out.fm_contextMenuError = "Unable to open the context menu for that element. If the problem persist, try to reload the page.";
+    out.fm_selectError = "Unable to select the targetted element. If the problem persist, try to reload the page.";
+    out.fm_categoryError = "Unable to open the selected category, displaying root.";
+    out.fm_info_root = "Create as many nested folders here as you want to sort your files.";
+    out.fm_info_unsorted = 'Contains all the files you\'ve visited that are not yet sorted in "Documents" or moved to the "Trash".'; // "My Documents" should match with the "out.fm_rootName" key, and "Trash" with "out.fm_trashName"
+    out.fm_info_template = 'Contains all the pads stored as templates and that you can re-use when you create a new pad.';
+    out.updated_0_fm_info_trash = 'Empty your trash to free space in your CryptDrive.';
+    out.fm_info_trash = out.updated_0_fm_info_trash;
+    out.fm_info_allFiles = 'Contains all the files from "Documents", "Unsorted" and "Trash". You can\'t move or remove files from here.'; // Same here
+    out.fm_info_anonymous = 'You are not logged in so these pads may be deleted (<a href="https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/" target="_blank">find out why</a>). ' +
+                            '<a href="/register/">Sign up</a> or <a href="/login/">Log in</a> to keep them alive.';
+    out.fm_alert_backupUrl = "Backup link for this drive.<br>" +
+                             "It is <strong>highly recommended</strong> that you keep ip for yourself only.<br>" +
+                             "You can use it to retrieve all your files in case your browser memory got erased.<br>" +
+                             "Anybody with that link can edit or remove all the files in your file manager.<br>";
+    out.fm_alert_anonymous = "Hello there, you are currently using CryptPad anonymously, that's ok but your pads may be deleted after a period of " +
+                             "inactivity. We have disabled advanced features of the drive for anonymous users because we want to be clear that it is " +
+                             'not a safe place to store things. You can <a href="https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/" target="_blank">read more</a> about ' +
+                             'why we are doing this and why you really should <a href="/register/">Sign up</a> and <a href="/login/">Log in</a>.';
+    out.fm_backup_title = 'Backup link';
+    out.fm_nameFile = 'How would you like to name that file?';
+    out.fm_error_cantPin = "Internal server error. Please reload the page and try again.";
+    // File - Context menu
+    out.fc_newfolder = "New folder";
+    out.fc_rename = "Rename";
+    out.fc_open = "Open";
+    out.fc_open_ro = "Open (read-only)";
+    out.fc_delete = "Delete";
+    out.fc_restore = "Restore";
+    out.fc_remove = "Delete permanently";
+    out.fc_empty = "Empty the trash";
+    out.fc_prop = "Properties";
+    out.fc_sizeInKilobytes = "Size in Kilobytes";
+    // fileObject.js (logs)
+    out.fo_moveUnsortedError = "You can't move a folder to the list of unsorted pads";
+    out.fo_existingNameError = "Name already used in that directory. Please choose another one.";
+    out.fo_moveFolderToChildError = "You can't move a folder into one of its descendants";
+    out.fo_unableToRestore = "Unable to restore that file to its original location. You can try to move it to a new location.";
+    out.fo_unavailableName = "A file or a folder with the same name already exist at the new location. Rename the element and try again.";
+
+    out.fs_migration = "Your CryptDrive is being updated to a new version. As a result, the current page has to be reloaded.<br><strong>Please reload this page to continue to use it.</strong>";
+
+    // login
+    out.login_login = "Log in";
+    out.login_makeAPad = 'Create a pad anonymously';
+    out.login_nologin = "Browse local pads";
+    out.login_register = "Sign up";
+    out.logoutButton = "Log out";
+    out.settingsButton = "Settings";
+
+    out.login_username = "Username";
+    out.login_password = "Password";
+    out.login_confirm = "Confirm your password";
+    out.login_remember = "Remember me";
+
+    out.login_hashing = "Hashing your password, this might take some time.";
+
+    out.login_hello = 'Hello {0},'; // {0} is the username
+    out.login_helloNoName = 'Hello,';
+    out.login_accessDrive = 'Access your drive';
+    out.login_orNoLogin = 'or';
+
+    out.login_noSuchUser = 'Invalid username or password. Try again, or sign up';
+    out.login_invalUser = 'Username required';
+    out.login_invalPass = 'Password required';
+    out.login_unhandledError = 'An unexpected error occurred :(';
+
+    out.login_notRegistered = 'Not registered?';
+
+    out.register_importRecent = "Import pad history (Recommended)";
+    out.register_acceptTerms = "I accept <a href='/terms.html' tabindex='-1'>the terms of service</a>";
+    out.register_passwordsDontMatch = "Passwords do not match!";
+    out.register_mustAcceptTerms = "You must accept the terms of service.";
+    out.register_mustRememberPass = "We cannot reset your password if you forget it. It's very important that you remember it! Please check the checkbox to confirm.";
+
+    out.register_header = "Welcome to CryptPad";
+    out.register_explanation = [
+        "<p>Lets go over a couple things first</p>",
+        "<ul>",
+            "<li>Your password is your secret key which encrypts all of your pads. If you lose it there is no way we can recover your data.</li>",
+            "<li>You can import pads which were recently viewed in your browser so you have them in your account.</li>",
+            "<li>If you are using a shared computer, you need to log out when you are done, closing the tab is not enough.</li>",
+        "</ul>"
+    ].join('');
+
+    out.register_writtenPassword = "I have written down my username and password, proceed";
+    out.register_cancel = "Go back";
+
+    out.register_warning = "Zero Knowledge means that we can't recover your data if you lose your password.";
+
+    out.register_alreadyRegistered = "This user already exists, do you want to log in?";
+
+    // Settings
+    out.settings_cat_account = "Account";
+    out.settings_cat_drive = "CryptDrive";
+    out.settings_title = "Settings";
+    out.settings_save = "Save";
+
+    out.settings_backupCategory = "Backup";
+    out.settings_backupTitle = "Backup or restore all your data";
+    out.settings_backup = "Backup";
+    out.settings_restore = "Restore";
+
+    out.settings_resetNewTitle = "Clean CryptDrive";
+    out.settings_resetButton = "Remove";
+    out.settings_reset = "Remove all the files and folders from your CryptDrive";
+    out.settings_resetPrompt = "This action will remove all the pads from your drive.<br>"+
+                               "Are you sure you want to continue?<br>" +
+                               "Type “<em>I love CryptPad</em>” to confirm.";
+    out.settings_resetDone = "Your drive is now empty!";
+    out.settings_resetError = "Incorrect verification text. Your CryptDrive has not been changed.";
+
+    out.settings_resetTipsAction = "Reset";
+    out.settings_resetTips = "Tips";
+    out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
+    out.settings_resetTipsDone = "All the tips are now visible again.";
+
+    out.settings_importTitle = "Import this browser's recent pads in your CryptDrive";
+    out.settings_import = "Import";
+    out.settings_importConfirm = "Are you sure you want to import recent pads from this browser to your user account's CryptDrive?";
+    out.settings_importDone = "Import completed";
+
+    out.settings_userFeedbackTitle = "Feedback";
+    out.settings_userFeedbackHint1 = "CryptPad provides some very basic feedback to the server, to let us know how to improve your experience. ";
+    out.settings_userFeedbackHint2 = "Your pad's content will never be shared with the server.";
+    out.settings_userFeedback = "Enable user feedback";
+
+    out.settings_anonymous = "You are not logged in. Settings here are specific to this browser.";
+    out.settings_publicSigningKey = "Public Signing Key";
+
+    out.settings_usage = "Usage";
+    out.settings_usageTitle = "See the total size of your pinned pads in MB";
+    out.settings_pinningNotAvailable = "Pinned pads are only available to registered users.";
+    out.settings_pinningError = "Something went wrong";
+    out.settings_usageAmount = "Your pinned pads occupy {0}MB";
+
+    out.settings_logoutEverywhereButton = "Log out";
+    out.settings_logoutEverywhereTitle = "Log out everywhere";
+    out.settings_logoutEverywhere = "Force log out of all other web sessions";
+    out.settings_logoutEverywhereConfirm = "Are you sure? You will need to log in with all your devices.";
+
+    out.upload_title = "File upload";
+    out.upload_serverError = "Server Error: unable to upload your file at this time.";
+    out.upload_uploadPending = "You already have an upload in progress. Cancel it and upload your new file?";
+    out.upload_success = "Your file ({0}) has been successfully uploaded and added to your drive.";
+    out.upload_notEnoughSpace = "There is not enough space for this file in your CryptDrive.";
+    out.upload_tooLarge = "This file exceeds the maximum upload size.";
+    out.upload_choose = "Choose a file";
+    out.upload_pending = "Pending";
+    out.upload_cancelled = "Cancelled";
+    out.upload_name = "File name";
+    out.upload_size = "Size";
+    out.upload_progress = "Progress";
+    out.upload_mustLogin = "You must be logged in to upload files";
+    out.download_button = "Decrypt & Download";
+    out.download_mt_button = "Download";
+
+    // general warnings
+    out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. <a href='/about.html#pinning'>Learn more...</a>";

    // index.html

-    out.main_p1 = 'CryptPad is the <strong>zero knowledge</strong> realtime collaborative editor.  Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA.  The secret encryption key is stored in the URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.';
-    out.main_p2 = 'This project uses the <a href="http://ckeditor.com/">CKEditor</a> Visual Editor, <a href="https://codemirror.net/">CodeMirror</a>, and the <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> realtime engine.';
-    out.main_howitworks = 'How It Works';
-    out.main_howitworks_p1 = 'CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a <a href="https://bitcoin.org/bitcoin.pdf">Nakamoto Blockchain</a>, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';
-    out.main_about = 'About';
-    out.main_about_p1 = 'You can read more about our <a href="/privacy.html" title="">privacy policy</a> and <a href="/terms.html">terms of service</a>.';

+    //about.html
+    out.main_p2 = 'This project uses the <a href="http://ckeditor.com/">CKEditor</a> Visual Editor, <a href="https://codemirror.net/">CodeMirror</a>, and the <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> realtime engine.';
+    out.main_howitworks_p1 = 'CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a <a href="https://bitcoin.org/bitcoin.pdf">Nakamoto Blockchain</a>, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';
+
+    // contact.html
    out.main_about_p2 = 'If you have any questions or comments, you can <a href="https://twitter.com/cryptpad">tweet us</a>, open an issue <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">on github</a>, come say hi on irc (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), or <a href="mailto:research@xwiki.com">send us an email</a>.';

-    out.table_type = 'Type';
-    out.table_link = 'Link';
-    out.table_created = 'Created';
-    out.table_last = 'Last Accessed';
+    out.main_info = "<h1>Collaborate in Confidence</h1><br> Grow your ideas together with shared documents while <strong>Zero Knowledge</strong> technology secures your privacy; even from us.";

-    out.button_newpad = 'CREATE NEW WYSIWYG PAD';
-    out.button_newcode = 'CREATE NEW CODE PAD';
-    out.button_newpoll = 'CREATE NEW POLL';
-    out.button_newslide = 'CREATE NEW PRESENTATION';
+    out.main_howitworks = 'How It Works';
+    out.main_zeroKnowledge = 'Zero Knowledge';
+    out.main_zeroKnowledge_p = "You don't have to trust that we <em>won't</em> look at your pads, with CryptPad's revolutionary Zero Knowledge Technology we <em>can't</em>. Learn more about how we protect your <a href=\"/privacy.html\" title='Privacy'>Privacy and Security</a>.";
+    out.main_writeItDown = 'Write it down';
+
+    out.main_writeItDown_p = "The greatest projects come from the smallest ideas. Take down the moments of inspiration and unexpected ideas because you never know which one might be a breakthrough.";
+    out.main_share = 'Share the link, share the pad';
+    out.main_share_p = "Grow your ideas together: conduct efficient meetings, collaborate on TODO lists and make quick presentations with all your friends and all your devices.";
+    out.main_organize = 'Get organized';
+    out.main_organize_p = "With CryptPad Drive, you can keep your sights on what's important. Folders allow you to keep track of your projects and have a global vision of where things are going.";
+    out.tryIt = 'Try it out!';
+    out.main_richText = 'Rich Text editor';
+    out.main_richText_p = 'Edit rich text pads collaboratively with our realtime Zero Knowledge <a href="http://ckeditor.com" target="_blank">CkEditor</a> application.';
+    out.main_code = 'Code editor';
+    out.main_code_p = 'Edit code from your software collaboratively with our realtime Zero Knowledge <a href="https://www.codemirror.net" target="_blank">CodeMirror</a> application.';
+    out.main_slide = 'Slide editor';
+    out.main_slide_p = 'Create your presentations using the Markdown syntax, and display them in your browser.';
+    out.main_poll = 'Polls';
+    out.main_poll_p = 'Plan your meeting or your event, or vote for the best solution regarding your problem.';
+    out.main_drive = 'CryptDrive';
+
+    out.footer_applications = "Applications";
+    out.footer_contact = "Contact";
+    out.footer_aboutUs = "About us";
+
+    out.about = "About";
+    out.privacy = "Privacy";
+    out.contact = "Contact";
+    out.terms = "ToS";
+    out.blog = "Blog";

    // privacy.html

-    out.policy_title = 'Cryptpad Privacy Policy';
+    out.policy_title = 'CryptPad Privacy Policy';
    out.policy_whatweknow = 'What we know about you';
-    out.policy_whatweknow_p1 = 'As an application that is hosted on the web, Cryptpad has access to metadata exposed by the HTTP protocol. This includes your IP address, and various other HTTP headers that can be used to identify your particular browser. You can see what information your browser is sharing by visiting <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>.';
-    out.policy_whatweknow_p2 = 'We use <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, an open source analytics platform, to learn more about our users. Piwik tells us about how you found Cryptpad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter. We also learn when you visit, what links you click while on our informational pages, and how long you stay on a particular page.';
-    out.policy_whatweknow_p3 = 'These analytics tools are only used on informational pages. We do not collect any information about your usage of our zero-knowledge applications.';
+    out.policy_whatweknow_p1 = 'As an application that is hosted on the web, CryptPad has access to metadata exposed by the HTTP protocol. This includes your IP address, and various other HTTP headers that can be used to identify your particular browser. You can see what information your browser is sharing by visiting <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>.';
+    out.policy_whatweknow_p2 = 'We use <a href="https://www.elastic.co/products/kibana" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Kibana</a>, an open source analytics platform, to learn more about our users. Kibana tells us about how you found CryptPad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter.';
    out.policy_howweuse = 'How we use what we learn';
-    out.policy_howweuse_p1 = 'We use this information to make better decisions about promoting Cryptpad, by evaluating which of our past efforts were successful. Information about your location lets us know whether we should consider providing better support for languages other than English.';
+    out.policy_howweuse_p1 = 'We use this information to make better decisions about promoting CryptPad, by evaluating which of our past efforts were successful. Information about your location lets us know whether we should consider providing better support for languages other than English.';
    out.policy_howweuse_p2 = "Information about your browser (whether it's a desktop or mobile operating system) helps us make decisions when prioritizing feature improvements. Our development team is small, and we try to make choices that will improve as many users' experience as possible.";
    out.policy_whatwetell = 'What we tell others about you';
    out.policy_whatwetell_p1 = 'We do not furnish to third parties the information that we gather or that you provide to us unless we are legally required to do so.';
    out.policy_links = 'Links to other sites';
-    out.policy_links_p1 = 'This site contains links to other sites, including those produced by other organizations. We are not responsible for the privacy practices or the contents of any outside sites. As a general rule, links to outside sites are launched in a new browser window, to make clear that you are leaving Cryptpad.fr.';
+    out.policy_links_p1 = 'This site contains links to other sites, including those produced by other organizations. We are not responsible for the privacy practices or the contents of any outside sites. As a general rule, links to outside sites are launched in a new browser window, to make clear that you are leaving CryptPad.fr.';
    out.policy_ads = 'Advertisement';
    out.policy_ads_p1 = 'We do not display any online advertising, though we may link to the bodies which are financing our research.';
    out.policy_choices = 'Choices you have';
-    out.policy_choices_open = 'Our code is open source, so you always have the option of hosting your own instance of Cryptpad.';
+    out.policy_choices_open = 'Our code is open source, so you always have the option of hosting your own instance of CryptPad.';
    out.policy_choices_vpn = 'If you want to use our hosted instance, but don\'t want to expose your IP address, you can protect your IP using the <a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads from the Tor project" target="_blank" rel="noopener noreferrer">Tor browser bundle</a>, or a <a href="https://riseup.net/en/vpn" title="VPNs provided by Riseup" target="_blank" rel="noopener noreferrer">VPN</a>.';
    out.policy_choices_ads = 'If you just want to block our analytics platform, you can use adblocking tools like <a href="https://www.eff.org/privacybadger" title="download privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';

    // terms.html

-    out.tos_title = "Cryptpad Terms of Service";
+    out.tos_title = "CryptPad Terms of Service";
    out.tos_legal = "Please don't be malicious, abusive, or do anything illegal.";
    out.tos_availability = "We hope you find this service useful, but availability or performance cannot be guaranteed. Please export your data regularly.";
-    out.tos_e2ee = "Cryptpad documents can be read or modified by anyone who can guess or otherwise obtain the document's fragment identifier. We recommend that you use end-to-end-encrypted (e2ee) messaging technology to share URLs, and assume no liability in the event that such a URL is leaked.";
+    out.tos_e2ee = "CryptPad contents can be read or modified by anyone who can guess or otherwise obtain the pad's fragment identifier. We recommend that you use end-to-end-encrypted (e2ee) messaging technology to share links, and assume no liability in the event that such a link is leaked.";
    out.tos_logs = "Metadata provided by your browser to the server may be logged for the purpose of maintaining the service.";
    out.tos_3rdparties = "We do not provide individualized data to third parties unless required to by law.";

    // BottomBar.html

-    out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Made with <img class="bottom-bar-heart" src="/customize/heart.png" /> in <img class="bottom-bar-fr" src="/customize/fr.png" /></a>';
+    out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Made with <img class="bottom-bar-heart" src="/customize/heart.png" alt="love" /> in <img class="bottom-bar-fr" src="/customize/fr.png" alt="France" /></a>';
    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">An <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs Project </a> with the support of <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';

    // Header.html

-    out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">With <img class="bottom-bar-heart" src="/customize/heart.png" /> from <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> by <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+    out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">With <img class="bottom-bar-heart" src="/customize/heart.png" alt="love" /> from <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> by <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';

-
-    // TODO Hardcode cause YOLO
-    //out.header_xwiki = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer"><img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
    out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
-    out.header_logoTitle = 'Go to the main page';
+    out.updated_0_header_logoTitle = 'Go to your CryptDrive';
+    out.header_logoTitle = out.updated_0_header_logoTitle;
+
+    // Initial states
+
+    out.initialState = [
+        '<span style="font-size:16px;"><p>',
+        'This is&nbsp;<strong>CryptPad</strong>, the Zero Knowledge realtime collaborative editor. Everything is saved as you type.',
+        '<br>',
+        'Share the link to this pad to edit with friends or use the <span class="fa fa-share-alt" style="border: 1px solid black;color:#000;">&nbsp;Share&nbsp;</span> button to share a <em>read-only link</em>&nbsp;which allows viewing but not editing.',
+        '</p>',
+
+        '<p><em>',
+        'Go ahead, just start typing...',
+        '</em></p></span>',
+        '<p>&nbsp;<br></p>'
+    ].join('');
+
+    out.codeInitialState = [
+        '# CryptPad\'s Zero Knowledge collaborative code editor\n',
+        '\n',
+        '* What you type here is encrypted so only people who have the link can access it.\n',
+        '* You can choose the programming language to highlight and the UI color scheme in the upper right.'
+    ].join('');
+
+    out.slideInitialState = [
+        '# CryptSlide\n',
+        '* This is a zero knowledge realtime collaborative editor.\n',
+        '* What you type here is encrypted so only people who have the link can access it.\n',
+        '* Even the server cannot see what you type.\n',
+        '* What you see here, what you hear here, when you leave here, let it stay here.\n',
+        '\n',
+        '---',
+        '\n',
+        '# How to use\n',
+        '1. Write your slides content using markdown syntax\n',
+        '  - Learn more about markdown syntax [here](http://www.markdowntutorial.com/)\n',
+        '2. Separate your slides with ---\n',
+        '3. Click on the "Play" button to see the result',
+        '  - Your slides are updated in realtime'
+    ].join('');
+
+    // Readme
+
+    out.driveReadmeTitle = "What is CryptDrive?";
+    out.readme_welcome = "Welcome to CryptPad !";
+    out.readme_p1 = "Welcome to CryptPad, this is where you can take note of things alone and with friends.";
+    out.readme_p2 = "This pad will give you a quick walk through of how you can use CryptPad to take notes, keep them organized and work together on them.";
+    out.readme_cat1 = "Get to know your CryptDrive";
+    out.readme_cat1_l1 = "Make a pad: In your CryptDrive, click {0} then {1} and you can make a pad."; // 0: New, 1: Rich Text
+    out.readme_cat1_l2 = "Open Pads from your CryptDrive: double-click on a pad icon to open it.";
+    out.readme_cat1_l3 = "Organize your pads: When you are logged in, every pad you access will be shown as in the {0} section of your drive."; // 0: Unsorted files
+    out.readme_cat1_l3_l1 = "You can click and drag files into folders in the {0} section of your drive and make new folders."; // 0: Documents
+    out.readme_cat1_l3_l2 = "Remember to try right clicking on icons because there are often additional menus.";
+    out.readme_cat1_l4 = "Put old pads in the trash: You can click and drag your pads into the {0} the same way you drag them into folders."; // 0: Trash
+    out.readme_cat2 = "Make pads like a pro";
+    out.edit = "edit";
+    out.view = "view";
+    out.readme_cat2_l1 = "The {0} button in your pad allows you to give access to collaborators to either {1} or to {2} the pad."; // 0: Share, 1: edit, 2: view
+    out.readme_cat2_l2 = "Change the title of the pad by clicking on the pencil";
+    out.readme_cat3 = "Discover CryptPad apps";
+    out.readme_cat3_l1 = "With CryptPad code editor, you can collaborate on code like Javascript and markdown like HTML and Markdown";
+    out.readme_cat3_l2 = "With CryptPad slide editor, you can make quick presentations using Markdown";
+    out.readme_cat3_l3 = "With CryptPoll you can take quick votes, especially for scheduling meetings which fit with everybody's calendar";
+
+    // Tips
+    out.tips = {};
+    out.tips.lag = "The green icon in the upper right shows the quality of your internet connection to the CryptPad server.";
+    out.tips.shortcuts = "`ctrl+b`, `ctrl+i` and `ctrl+u` are quick shortcuts for bold, italic and underline.";
+    out.tips.indent = "In numbered and bulleted lists, you can use tab or shift+tab to quickly increase or decrease indentation.";
+    out.tips.title = "You can set the title of your pad by clicking the top center.";
+    out.tips.store = "Every time you visit a pad, if you're logged in it will be saved to your CryptDrive.";
+    out.tips.marker = "You can highlight text in a pad using the \"marker\" item in the styles dropdown menu.";
+    out.tips.driveUpload = "Registered users can upload encrypted files by dragging and dropping them into their CryptDrive.";
+
+    out.feedback_about = "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions";
+    out.feedback_privacy = "We care about your privacy, and at the same time we want CryptPad to be very easy to use.  We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.";
+    out.feedback_optout = "If you would like to opt out, visit <a href='/settings/'>your user settings page</a>, where you'll find a checkbox to enable or disable user feedback";

    return out;
 });
--- a/customize.dist/translations/messages.pl.js
+++ b/customize.dist/translations/messages.pl.js
@ -0,0 +1,163 @@
+define(function () {
+    var out = {};
+
+    // translations must set this key for their language to be available in
+    // the language dropdowns that are shown throughout Cryptpad's interface
+    out._languageName = 'Polish';
+
+    out.main_title = "Cryptpad: Wspólne edytowanie w czasie rzeczywistym, bez wiedzy specjalistycznej";
+    out.main_slogan = "Jedność siłą - Współpraca kluczem";
+
+    out.type = {};
+    out.type.pad = 'Pad';
+    out.type.code = 'Kod';
+    out.type.poll = 'Balot';
+    out.type.slide = 'Prezentacja';
+
+    out.common_connectionLost = 'Przerwano połączenie z serwerem';
+
+    out.disconnected = 'Rozłączony';
+    out.synchronizing = 'Synchronizacja';
+    out.reconnecting = 'Wznawianie połączenia...';
+    out.lag = 'Lag';
+    out.readonly = 'Tylko do odczytu';
+    out.anonymous = "Anonimowy";
+    out.yourself = "Ty";
+    out.anonymousUsers = "użytkownicy anonimowi";
+    out.anonymousUser = "użytkownik anonimowy";
+    out.users = "Użytkownicy";
+    out.and = "i";
+    out.viewer = "czytający";
+    out.viewers = "czytających";
+    out.editor = "edytujący";
+    out.editors = "edytujących";
+
+    out.greenLight = "Wszystkie systemy działają poprawnie";
+    out.orangeLight = "Słabe łącze może wpłynąć na działanie aplikacji";
+    out.redLight = "Zostałeś rozłączony z sesją";
+
+    out.importButtonTitle = 'Importuj dokument z pliku lokalnego';
+
+    out.exportButtonTitle = 'Zapisz ten dokument do pliku';
+    out.exportPrompt = 'Jak chciałbyś nazwać swój plik?';
+
+    out.changeNamePrompt = 'Zmień swoją nazwę (Pozostaw puste, by być anonimowym): ';
+
+    out.clickToEdit = "Naciśnij by edytować";
+
+    out.forgetButtonTitle = 'Usuń ten dokument z listy wyświetlanej na stronie głównej';
+    out.forgetPrompt = 'Wciskając OK usuniesz ten URL z pamięci lokalnej, jesteś tego pewien?';
+
+    out.shareButton = 'Udostępnij';
+    out.shareSuccess = 'Pomyślnie skopiowano URL';
+
+    out.presentButtonTitle = "Otwórz tryb prezentacji";
+    out.presentSuccess = 'Naciśnij ESC aby wyjść z trybu prezentacji';
+
+    out.backgroundButtonTitle = 'Zmień kolor tła dla tej prezentacji';
+    out.colorButtonTitle = 'Zmień kolor tekstu dla tej prezentacji';
+
+
+    out.editShare = "Udostępnij URL do edycji";
+    out.editShareTitle = "Zapisz URL do edycji w schowku";
+    out.viewShare = "Udostępnij URL tylko do odczytu";
+    out.viewShareTitle = "Zapisz URL tylko do odczytu w schowku";
+    out.viewOpen = "Otwórz podgląd w nowej karcie";
+    out.viewOpenTitle = "Otwórz ten dokument w nowej karcie, tylko do odczytu";
+
+    out.notifyJoined = "{0} dołączył do sesji współpracy";
+    out.notifyRenamed = "{0} jest teraz znany jako {1}";
+    out.notifyLeft = "{0} opuścił sesję współpracy";
+
+    out.tryIt = 'Wypróbuj!';
+
+    out.okButton = 'OK (enter)';
+    out.cancelButton = 'Anuluj (esc)';
+
+    // Polls
+
+    out.poll_title = "Prosty koordynator spotkań"; // Choice of "Koordynator" can be discussed
+    out.poll_subtitle = "Proste planowanie spotkań, <em>w czasie rzeczywistym</em>";
+
+    out.poll_p_save = "Twoje ustawienia aktualizowane są na bieżąco. Nie martw się zapisywaniem.";
+    out.poll_p_encryption = "Wszystko co robisz jest szyfrowane, więc tylko osoby z linkiem mają tu dostęp. Nawet serwer nie widzi co kombinujesz.";
+
+    out.wizardLog = "Naciśnij przycisk w lewym-górnym rogu by wrócić do planu";
+    out.wizardTitle = "Uzyj kreatora by stworzyć opcje do głosowania";
+    out.wizardConfirm = "Jesteś pewny, że chcesz dodać te opcje do głosowania?";
+
+    out.poll_closeWizardButton = "Zamknij kreator";
+    out.poll_closeWizardButtonTitle = "Zamyka kreator";
+    out.poll_wizardComputeButton = "Ustawienia kalkulacji";
+    out.poll_wizardClearButton = "Wyczyść tabelę";
+    out.poll_wizardDescription = "Automatycznie stwórz część opcji poprzez wpisanie ilości dat i godzin";
+    out.poll_wizardAddDateButton = "+ Daty";
+    out.poll_wizardAddTimeButton = "+ Godziny";
+
+    out.poll_optionPlaceholder = "Opcja";
+    out.poll_userPlaceholder = "Twoje imię";
+    out.poll_removeOption = "Jesteś pewien, że chcesz usunąć tę opcję?";
+    out.poll_removeUser = "Jesteś pewien, że chcesz usunąć tego użytkownika?";
+
+    out.poll_titleHint = "Tytuł";
+    out.poll_descriptionHint = "Opis";
+
+    // index.html
+
+    out.main_p2 = 'Ten projekt wykorzystuje wizualny edytor <a href="http://ckeditor.com/">CKEditor</a> , <a href="https://codemirror.net/">CodeMirror</a>, oraz silnik czasu rzeczywistego <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a>.';
+    out.main_howitworks = 'Jak to działa';
+    out.main_howitworks_p1 = 'CryptPad wykorzystuje wariant algorytmu <a href="https://en.wikipedia.org/wiki/Operational_transformation">Transformacji operacyjnej</a> który jest wstanie odnaleźć rozdzielony konsensus wprowadzanych danych. Używa do tego <a href="https://bitcoin.org/bitcoin.pdf">Łańcuch blokowy Nakamoto</a>, twór zpopularyzowany przez <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. W ten sposób algorytm może pominąć potrzebę centralnego serwera do rozwiązywania Konfliktów Operacji Przekształcania poprzez Edycję. Bez potrzeby rozwiązywania konfliktów, serwer może pozostać w niewiedzy o zawartości która jest edytowana w dokumencie.';
+
+    out.main_about_p2 = 'Jeżeli masz jakieś pytania lub komentarze, możesz napisać na <a href="https://twitter.com/cryptpad">tweeterze</a>, otworzyć problem na <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">githubie</a>, przywitać się na ircu (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), lub wysłać nam <a href="mailto:research@xwiki.com">email</a>.';
+
+    out.button_newpad = 'STWÓRZ PAD WYSIWYG';
+    out.button_newcode = 'STWÓRZ PAD DO KODU';
+    out.button_newpoll = 'STWÓRZ GŁOSOWANIE';
+    out.button_newslide = 'STWÓRZ PREZENTACJĘ';
+
+    // privacy.html
+
+    out.policy_title = 'Polityka prywatności CryptPad';
+    out.policy_whatweknow = 'Co o tobie wiemy';
+    out.policy_whatweknow_p1 = 'Jako aplikacja udostępniana w internecie, CryptPad ma dostęp do metadanych wystawianych przez protokół HTTP. W skład tych danych wchodzi adres IP oraz różne inne nagłówki HTTP które pozwalają na identyfikację twojej przeglądarki. Możesz podejrzeć jakie informacje udostępnia twoja przeglądarka odwiedzając <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>.';
+    out.policy_whatweknow_p2 = 'Używamy <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, Open Sourcowej platformy analitycznej, aby dowiedzieć się czegoś o naszych użytkownikach. Piwik mówi nam, skąd dowiedziałeś się o Cryptpad. Bezpośrednio przez adres, silnik wyszukiwany, czy z polecenia innej usługi internetowej jak Reddit czy Twitter. Uczymy się również gdy nas odwiedzasz, jakie linki odwiedzasz z naszej strony informacyjnej i jak długo pozostajesz na konkretnych stronach.';
+    out.policy_howweuse = 'Jak wykorzystujemy zebraną wiedzę';
+    out.policy_howweuse_p1 = 'Dzieki tym informacjom możemy podejmować lepsze decyzje przy promocji CryptPad, poprzez ocenę które z podjętych przez nas prób okazały się udane. Informacja o twojej lokalizacji daje nam znać, czy powinniśmy zapewnić lepsze wsparcie dla języków poza Angielskim.';
+    out.policy_howweuse_p2 = "Informacje o twojej przeglądarce (czy jest to aplikacja desktopowa, czy działająca na systemie mobilnym) pozwalają nam na decydowanie przy priorytezowaniu ulepszeń funkcji. Nasz zespół deweloperski jest mały, a my staramy się dokonywać wyborów które poprawią doświadczenia jak największej liczby użytkowników.";
+    out.policy_whatwetell = 'Jakie dane przekazujemy innym';
+    out.policy_whatwetell_p1 = 'Nie dostarczamy osobom trzecim żadnych danych które udało się nam zebrać, lub tych które nam przekazałeś sam, dopóki nie jesteśmy do tego zobligowani prawnie.';
+    out.policy_links = 'Adresy innych stron';
+    out.policy_links_p1 = 'Ta witryna zawiera łącza do innych stron, włączając w to te stworzone przez inne organizacje. Nie jesteśmy odpowiedzialni za praktyki dotyczące prywatności oraz zawartość usługodawców poza tą witryną. Jako główną zasadę przyjmujemy, że łącza do stron zewnętrznych uruchamiane są w nowej karcie lub oknie, aby upewnić cię iż opuszczasz Cryptpad.';
+    out.policy_ads = 'Promocja i reklama';
+    out.policy_ads_p1 = 'Nie wyświetlamy żadnej zawartości promocyjnej online, choć możemy udostępniać łącza do podmiotów finansujących nasze badania.';
+    out.policy_choices = 'Co możesz zrobić';
+    out.policy_choices_open = 'Nasz kod jest open source, więc zawsze masz możliwość hostowania swojej własnej wersji Cryptpad.';
+    out.policy_choices_vpn = 'Jeżeli chcesz korzystać z wersji udostępnianej przez nas, lecz nie chcesz pokazywać swojego adresu IP, możesz chronić swój adres wykorzystując <a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads from the Tor project" target="_blank" rel="noopener noreferrer">przeglądarki Tor</a>, lub <a href="https://riseup.net/en/vpn" title="VPNs provided by Riseup" target="_blank" rel="noopener noreferrer">VPN</a>.';
+    out.policy_choices_ads = 'Masz również możliwość blokady naszej platformy analitycznej wykorzystując narzędzia adblock, takie jak <a href="https://www.eff.org/privacybadger" title="download privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';
+
+    // terms.html
+
+    out.tos_title = "Warunki korzystania z usług Cryptpad";
+    out.tos_legal = "Prosimy abyś nie był złośliwy, obelżywy i nie wykorzystywał tego oprogramowania do celow niezgodnych z prawem.";
+    out.tos_availability = "Mamy nadzieję iż uznasz tę usługę za przydatną, lecz dostępność i wydajność nie mogą być przez nas gwarantowane. Prosimy, abyś eksportował swoje dane regularnie.";
+    out.tos_e2ee = "Dokumenty Cryptpad mogą być odczytywane i modyfikowane przez każdego kto może zgadnąć lub w inny sposób uzyskać identyfikator dokumentu. Polecamy korzystania z oprogramowania szyfrującego end-to-end (e2ee) do udostępniania linków URL. Nie będziesz rościł sobie żadnych wierzytelności w wypadku gdy taki URL dostanie się w niepowołane ręce.";
+    out.tos_logs = "Metadane dostarczane przez twoją przeglądarkę do serwera mogą być zapisywane i przechowywane w celu utrzymywania serwisu.";
+    out.tos_3rdparties = "Nie dostarczamy indywidualizowanych danych do osób trzecich, poza sytuacjami dyktowanymi prawnie.";
+
+    // BottomBar.html
+
+    out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Stworzone z <img class="bottom-bar-heart" src="/customize/heart.png" /> we <img class="bottom-bar-fr" src="/customize/fr.png" /></a>';
+    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">Projekt <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs </a> we wspolpracy z <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+
+    // Header.html
+
+    out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Pełne <img class="bottom-bar-heart" src="/customize/heart.png" /> z <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> od <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+
+
+    // TODO Hardcode cause YOLO
+    //out.header_xwiki = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer"><img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+    out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+    out.header_logoTitle = 'Przejdź na stronę główną';
+
+    return out;
+});
--- a/customize.dist/translations/messages.pt-br.js
+++ b/customize.dist/translations/messages.pt-br.js
@ -19,6 +19,7 @@ define(function () {
    out.type.code = 'Código';
    out.type.poll = 'votação';
    out.type.slide = 'Apresentação';
+
    out.type.drive = 'Drive';
    out.type.whiteboard = 'Whiteboard';
    out.type.file = 'File';
@ -46,6 +47,7 @@ define(function () {
    out.synced = "Tudo foi salvo";
    out.deleted = "Bloco deletado do seu CryptDrive";

+
    out.disconnected = 'Desconectado';
    out.synchronizing = 'Sincronizando';
    out.reconnecting = 'Reconectando...';
@ -84,6 +86,7 @@ define(function () {
    out.orangeLight = "Sua conexão lenta pode impactar sua experiência";
    out.redLight = "Você está desconectado da sua sessão";

+
    out.pinLimitReached = "Você alcançou o limite de armazenamento";
    out.updated_0_pinLimitReachedAlert = "Você alcançou o limite de armazenamento. Novos blocos não serão mais salvos no seu CryptDrive.<br>" +
        'Você pode deletar blocos do seu CryptDrive ou <a href="https://accounts.cryptpad.fr/#!on={0}" target="_blank">se inscrever como premium</a> para aumentar o limite de espaço.';
@ -99,6 +102,7 @@ define(function () {
    out.exportButtonTitle = 'Exportar esta sesão para um arquivo local';
    out.exportPrompt = 'Como deseja nomear seu arquivo?';

+
    out.changeNamePrompt = 'Mude seu nome (deixe em branco para se manter anônimo): ';
    out.user_rename = "Mudar nome de exibição";
    out.user_displayName = "Nome visível";
@ -141,6 +145,7 @@ define(function () {
    out.slideOptionsTitle = "Personalizar seus slides";
    out.slideOptionsButton = "Salvar (Enter)";

+
    out.editShare = "Compartilhar endereço editável";
    out.editShareTitle = "Copiar endereço editável";
    out.editOpen = "Abrir endereço editável em nova aba";
@ -152,6 +157,7 @@ define(function () {
    out.notifyRenamed = "{0} agora é conhecido como {1}";
    out.notifyLeft = "{0} deixou essa sessão colaborativa";

+
    out.okButton = 'OK (Enter)';

    out.cancel = "Cancelar";
@ -168,6 +174,7 @@ define(function () {
    out.history_restorePrompt = "Você tem certeza que deseja substituir a versão atual do documento pela que está sendo exibida agora?";
    out.history_restoreDone = "Documento restaurado";
    out.history_version = "Versão:";
+    out.tryIt = 'Experimente!';

    // Polls

@ -197,12 +204,15 @@ define(function () {

    out.poll_optionPlaceholder = "Alternativa";
    out.poll_userPlaceholder = "Seu nome";
+
    out.poll_removeOption = "Você tem certeza que deseja remover esta opção?";
+
    out.poll_removeUser = "Você tem certeza que quer remover este usuário?";

    out.poll_titleHint = "Título";
    out.poll_descriptionHint = "Descrição";

+
    // Canvas
    out.canvas_clear = "Limpar";
    out.canvas_delete = "Deletar seleção";
@ -324,6 +334,7 @@ define(function () {
        "</ul>"
    ].join('');

+
    out.register_writtenPassword = "I have written down my username and password, proceed";
    out.register_cancel = "Go back";

@ -386,6 +397,7 @@ define(function () {
    // general warnings
    out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. <a href='/about.html#pinning'>Learn more...</a>";

+
    // index.html

    //about.html
@ -427,6 +439,7 @@ define(function () {
    out.terms = "ToS";
    out.blog = "Blog";

+
    // privacy.html

    out.policy_title = 'Política de privacidade do Cryptpad';
--- a/customize.dist/translations/messages.ro.js
+++ b/customize.dist/translations/messages.ro.js
@ -0,0 +1,371 @@
+define(function () {
+    var out = {};
+
+    out.main_title = "CryptPad: Zero Knowledge, Colaborare în timp real";
+    out.main_slogan = "Puterea stă în cooperare - Colaborarea este cheia";
+
+    out.type = {};
+    out.pad = "Rich text";
+    out.code = "Code";
+    out.poll = "Poll";
+    out.slide = "Presentation";
+    out.drive = "Drive";
+    out.whiteboard = "Whiteboard";
+    out.file = "File";
+    out.media = "Media";
+
+    out.button_newpad = "Filă Text Nouă";
+    out.button_newcode = "Filă Cod Nouă";
+    out.button_newpoll = "Sondaj Nou";
+    out.button_newslide = "Prezentare Nouă";
+    out.button_newwhiteboard = "Fila Desen Nouă";
+    out.updated_0_common_connectionLost = "<b>Conexiunea la server este pierdută</b><br>Până la revenirea conexiunii, vei fi în modul citire";
+    out.common_connectionLost = out.updated_0_common_connectionLost;
+    out.websocketError = "Conexiune inexistentă către serverul websocket...";
+    out.typeError = "Această filă nu este compatibilă cu aplicația aleasă";
+    out.onLogout = "Nu mai ești autentificat, <a href=\"/\" target=\"_blank\">apasă aici</a> să te autentifici<br>sau apasă <em>Escape</em>să accesezi fila în modul citire.";
+    out.wrongApp = "Momentan nu putem arăta conținutul sesiunii în timp real în fereastra ta. Te rugăm reîncarcă pagina.";
+    out.loading = "Încarcă...";
+    out.error = "Eroare";
+
+    out.saved = "Salvat";
+    out.synced = "Totul a fost salvat";
+    out.deleted = "Pad șters din CryptDrive-ul tău";
+    out.disconnected = "Deconectat";
+    out.synchronizing = "Se sincronizează";
+    out.reconnecting = "Reconectare...";
+    out.lag = "Decalaj";
+    out.readonly = "Mod citire";
+    out.anonymous = "Anonim";
+    out.yourself = "Tu";
+    out.anonymousUsers = "editori anonimi";
+    out.anonymousUser = "editor anonim";
+    out.users = "Utilizatori";
+    out.and = "Și";
+    out.viewer = "privitor";
+    out.viewers = "privitori";
+    out.editor = "editor";
+    out.editors = "editori";
+    out.language = "Limbă";
+    out.upgrade = "Actualizare";
+    out.upgradeTitle = "Actualizează-ți contul pentru a mări limita de stocare";
+    out.MB = "MB";
+    out.greenLight = "Totul funcționează corespunzător";
+    out.orangeLight = "Conexiunea lentă la internet îți poate afecta experiența";
+    out.redLight = "Ai fost deconectat de la sesiune";
+    out.pinLimitReached = "Ai atins limita de stocare";
+    out.pinLimitReachedAlert = "Ai atins limita de stocare. Noile pad-uri nu vor mai fi stocate în CryptDrive.<br>Pentru a rezolva această problemă, poți să nlături pad-uri din CryptDrive-ul tău (incluzând gunoiul) sau să subscrii la un pachet premium pentru a-ți extinde spațiul de stocare.";
+    out.pinLimitNotPinned = "Ai atins limita de stocare.<br>Acest pad nu va fi stocat n CryptDrive-ul tău.";
+    out.pinLimitDrive = "Ai atins limita de stocare.<br>Nu poți să creezi alte pad-uri.";
+    out.importButtonTitle = "Importă un pad dintr-un fișier local";
+    out.exportButtonTitle = "Exportă pad-ul acesta către un fișier local";
+    out.exportPrompt = "Cum ai vrea să îți denumești fișierul?";
+    out.changeNamePrompt = "Schimbă-ți numele (lasă necompletat dacă vrei să fii anonim): ";
+    out.user_rename = "Schimbă numele afișat";
+    out.user_displayName = "Nume afișat";
+    out.user_accountName = "Nume cont";
+    out.clickToEdit = "Click pentru editare";
+    out.forgetButtonTitle = "Mută acest pad la gunoi";
+    out.forgetPrompt = "Click-ul pe OK va muta acest pad la gunoi. Ești sigur?";
+    out.movedToTrash = "Acest pad a fost mutat la gunoi.<br><a href=\"/drive/\">Acesează-mi Drive-ul</a>";
+    out.shareButton = "Distribuie";
+    out.shareSuccess = "Link copiat în clipboard";
+    out.newButton = "Nou";
+    out.newButtonTitle = "Crează un nou pad";
+    out.saveTemplateButton = "Salvează ca șablon";
+    out.saveTemplatePrompt = "Alege un titlu pentru șablon";
+    out.templateSaved = "Șablon salvat!";
+    out.selectTemplate = "Selectează un șablon sau apasă escape";
+    out.presentButtonTitle = "Intră în modul de prezentare";
+    out.presentSuccess = "Apasă ESC pentru a ieși din modul de prezentare";
+    out.backgroundButtonTitle = "Schimbă culoarea de fundal din prezentare";
+    out.colorButtonTitle = "Schimbă culoarea textului în modul de prezentare";
+    out.printButton = "Printează (enter)";
+    out.printButtonTitle = "Printează-ți slide-urile sau exportă-le ca fișier PDF";
+    out.printOptions = "Opțiuni schemă";
+    out.printSlideNumber = "Afișează numărul slide-ului";
+    out.printDate = "Afișează data";
+    out.printTitle = "Afișează titlul pad-ului";
+    out.printCSS = "Reguli de stil personalizate (CSS):";
+    out.printTransition = "Permite tranziția animațiilor";
+    out.slideOptionsTitle = "Personalizează-ți slide-urile";
+    out.slideOptionsButton = "Salvează (enter)";
+    out.editShare = "Editează link-ul";
+    out.editShareTitle = "Copiază link-ul de editare în clipboard";
+    out.editOpen = "Deschide link-ul de editare într-o nouă filă";
+    out.editOpenTitle = "Deschide acest pad în modul de editare într-o nouă filă";
+    out.viewShare = "Link în modul citire";
+    out.viewShareTitle = "Copiază link-ul în modul de citire în clipboard";
+    out.viewOpen = "Deschide link-ul în modul de citire într-o filă nouă";
+    out.viewOpenTitle = "Deschide acest pad în modul de citire într-o nouă filă";
+    out.notifyJoined = "{0} s-au alăturat sesiunii colaborative";
+    out.notifyRenamed = "{0} e cunoscut ca {1}";
+    out.notifyLeft = "{0} au părăsit sesiunea colaborativă";
+    out.okButton = "OK (enter)";
+    out.cancel = "Anulează";
+    out.cancelButton = "Anulează (esc)";
+    out.historyButton = "Afișează istoricul documentului";
+    out.history_next = "Mergi la versiunea următoare";
+    out.history_prev = "Mergi la versiunea trecută";
+    out.history_goTo = "Mergi la sesiunea selectată";
+    out.history_close = "Înapoi";
+    out.history_closeTitle = "Închide istoricul";
+    out.history_restore = "Restabilește";
+    out.history_restoreTitle = "Restabilește versiunea selectată a documentului";
+    out.history_restorePrompt = "Ești sigur că vrei să înlocuiești versiunea curentă a documentului cu cea afișată?";
+    out.history_restoreDone = "Document restabilit";
+    out.history_version = "Versiune:";
+    out.poll_title = "Zero Knowledge Selector Dată";
+    out.poll_subtitle = "Zero Knowledge, <em>realtime</em> programare";
+    out.poll_p_save = "Setările tale sunt actualizate instant, așa că tu nu trebuie să salvezi.";
+    out.poll_p_encryption = "Tot conținutul tău este criptat ca doar persoanele cărora tu le dai link-ul să aibă acces. Nici serverul nu poate să vadă ce modifici.";
+    out.wizardLog = "Click pe butonul din dreapta sus pentru a te ntoarce la sondajul tău";
+    out.wizardTitle = "Folosește wizard-ul pentru a crea sondajul tău";
+    out.wizardConfirm = "Ești pregătit să adaugi aceste opțiuni la sondajul tău?";
+    out.poll_publish_button = "Publică";
+    out.poll_admin_button = "Admin";
+    out.poll_create_user = "Adaugă un nou utilizator";
+    out.poll_create_option = "Adaugă o nouă opțiune";
+    out.poll_commit = "Comite";
+    out.poll_closeWizardButton = "Închide wizard-ul";
+    out.poll_closeWizardButtonTitle = "Închide wizard-ul";
+    out.poll_wizardComputeButton = "Calculează Opțiunile";
+    out.poll_wizardClearButton = "Curăță Tabelul";
+    out.poll_wizardDescription = "Crează automat un număr de opțiuni întroducând orice număr de zile sau intervale orare";
+
+    out.poll_wizardAddDateButton = "+ Zi";
+    out.poll_wizardAddTimeButton = "+ Ore";
+    out.poll_optionPlaceholder = "Opțiune";
+    out.poll_userPlaceholder = "Numele tău";
+    out.poll_removeOption = "Ești sigur că vrei să îndepărtezi această opțiune?";
+    out.poll_removeUser = "Ești sigur că vrei să îndepărtezi aceast utilizator?";
+    out.poll_titleHint = "Titlu";
+    out.poll_descriptionHint = "Descrie sondajul, și apoi folosește butonul 'publică' când ai terminat. Orice utilizator care are link-ul poate modifica descrierea, dar descurajăm această practică.";
+    out.canvas_clear = "Curăță";
+    out.canvas_delete = "Curăță selecția";
+    out.canvas_disable = "Dezactivează modul desen";
+    out.canvas_enable = "Activează modul desen";
+    out.canvas_width = "Lățime";
+    out.canvas_opacity = "Opacitate";
+    out.fm_rootName = "Documente";
+    out.fm_trashName = "Gunoi";
+    out.fm_unsortedName = "Fișiere nesortate";
+    out.fm_filesDataName = "Toate fișierele";
+    out.fm_templateName = "Șabloane";
+    out.fm_searchName = "Caută";
+    out.fm_searchPlaceholder = "Caută...";
+    out.fm_newButton = "Nou";
+    out.fm_newButtonTitle = "Crează un nou pad sau folder";
+    out.fm_newFolder = "Folder nou";
+    out.fm_newFile = "Pad nou";
+    out.fm_folder = "Folder";
+    out.fm_folderName = "Numele folderului";
+    out.fm_numberOfFolders = "# de foldere";
+    out.fm_numberOfFiles = "# of files";
+    out.fm_fileName = "Nume filă";
+    out.fm_title = "Titlu";
+    out.fm_type = "Tip";
+    out.fm_lastAccess = "Ultima accesare";
+    out.fm_creation = "Creare";
+    out.fm_forbidden = "Acțiune interzisă";
+    out.fm_originalPath = "Ruta inițială";
+    out.fm_openParent = "Arată în folder";
+    out.fm_noname = "Document nedenumit";
+    out.fm_emptyTrashDialog = "Ești sigur că vrei să golești coșul de gunoi?";
+    out.fm_removeSeveralPermanentlyDialog = "Ești sigur că vrei să ștergi pentru totdeauna aceste {0} elemente din coșul de gunoi?";
+    out.fm_removePermanentlyDialog = "Ești sigur că vrei să ștergi acest element pentru totdeauna?";
+    out.fm_removeSeveralDialog = "Ești sigur că vrei să muți aceste {0} elemente la coșul de gunoi?";
+    out.fm_removeDialog = "Ești sigur că vrei să muți {0} la gunoi?";
+    out.fm_restoreDialog = "Ești sigur că vrei să restabilești {0} în locația trecută?";
+    out.fm_unknownFolderError = "Ultima locație vizitată sau cea selectată nu mai există. Deschidem fișierul părinte...";
+    out.fm_contextMenuError = "Nu putem deschide meniul de context pentru acest element. Dacă problema persistă, reîncarcă pagina.";
+    out.fm_selectError = "Nu putem selecta elementul vizat. Dacă problema persistă, reîncarcă pagina.";
+    out.fm_categoryError = "Nu putem deschide categoria selectată, afișează sursa.";
+    out.fm_info_root = "Crează câte foldere tip cuib ai nevoie pentru a-ți sorta fișierele.";
+    out.fm_info_unsorted = "Conține toate fișierele pe care le-ai vizitat și nu sunt sortate în \"Documente\" sau mutate în \"Gunoi\".";
+    out.fm_info_template = "Conține toate pad-urile stocate ca șabloane și pe care le poți refolosi atunci când creezi un nou pad.";
+    out.fm_info_trash = "Fișierele șterse din gunoi vor fi șterse și din \"Toate fișierele\", făcând imposibilă recuperarea fișierelor din managerul de fișiere.";
+    out.fm_info_allFiles = "Conține toate fișierele din \"Documente\", \"Nesortate\" și \"Gunoi\". Poți să muți sau să ștergi fișierele aici.";
+    out.fm_info_login = "Loghează-te";
+    out.fm_info_register = "Înscrie-te";
+    out.fm_info_anonymous = "Nu ești logat cu un cont valid așa că aceste pad-uri vor fi șterse (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">află de ce</a>). <a href=\"/register/\">Înscrie-te</a> sau <a href=\"/login/\">Loghează-te</a> pentru a le salva.";
+    out.fm_alert_backupUrl = "Link copie de rezervă pentru acest drive.<br> Este <strong>foarte recomandat</strong> să o păstrezi pentru tine.<br>Poți să o folosești pentru a recupera toate fișierele în cazul în care memoria browserului tău este șterge..<br>Oricine are linkul poate să editeze sau să îndepărteze toate fișierele din managerul tău de documente.<br>";
+    out.fm_alert_anonymous = "Salut, momentan folosești CryptPad în mod anonim. Este ok, doar că fișierele tale vor fi șterse după o perioadă de inactivitate. Am dezactivat caracteristicile avansate ale drive-ului pentru utilizatorii anonimi pentru a face clar faptul că stocare documentelor acolo nu este o metodă sigură. Poți să <a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">citești mai multe</a> despre motivarea noastră și despre ce de trebuie să te <a href=\"/register/\">Înregistrezi</a> si sa te <a href=\"/login/\">Loghezi</a>.";
+    out.fm_backup_title = "Link de backup";
+    out.fm_nameFile = "Cum ai vrea să numești fișierul?";
+    out.fc_newfolder = "Folder nou";
+    out.fc_rename = "Redenumește";
+    out.fc_open = "Deschide";
+    out.fc_open_ro = "Deschide (modul citire)";
+    out.fc_delete = "Șterge";
+    out.fc_restore = "Restaurează";
+    out.fc_remove = "Șterge permanent";
+    out.fc_empty = "Curăță coșul";
+    out.fc_prop = "Proprietăți";
+    out.fc_sizeInKilobytes = "Dimensiune n Kilobytes";
+    out.fo_moveUnsortedError = "Nu poți să muți un folder la lista de pad-uri nesortate";
+    out.fo_existingNameError = "Numele ales este deja folosit în acest director. Te rugăm să alegi altul.";
+    out.fo_moveFolderToChildError = "Nu poți să muți un folder într-unul dintre descendenții săi";
+    out.fo_unableToRestore = "Nu am reușit să restaurăm fișierul în locația de origine. Poți să ncerci să îl muți într-o nouă locație.";
+    out.fo_unavailableName = "Un fișier sau un folder cu același nume există deja în locația nouă. Redenumește elementul și încearcă din nou.";
+    out.login_login = "Loghează-te";
+    out.login_makeAPad = "Crează un pad în modul anonim";
+    out.login_nologin = "Răsfoiește pad-urile locale";
+    out.login_register = "Înscrie-te";
+    out.logoutButton = "Deloghează-te";
+    out.settingsButton = "Setări";
+    out.login_username = "Nume utilizator";
+    out.login_password = "Parolă";
+    out.login_confirm = "Confirmă parola";
+    out.login_remember = "Ține-mă minte";
+    out.login_hashing = "Încriptăm parola, o să mai dureze.";
+    out.login_hello = "Salut {0},";
+    out.login_helloNoName = "Salut,";
+    out.login_accessDrive = "Acesează-ți drive-ul";
+    out.login_orNoLogin = "sau";
+    out.login_noSuchUser = "Nume de utilizator sau parolă invalide. Încearcă din nou sau înscrie-te.";
+    out.login_invalUser = "Nume utilizator cerut";
+    out.login_invalPass = "Parolă cerută";
+    out.login_unhandledError = "O eroare neașteptată a avut loc emoticon_unhappy";
+    out.register_importRecent = "Importă istoricul pad-ului (Recomandat)";
+    out.register_acceptTerms = "Accept <a href='/terms.html'>termenii serviciului</a>";
+    out.register_passwordsDontMatch = "Parolele nu se potrivesc!";
+    out.register_mustAcceptTerms = "Trebuie să accepți termenii serviciului";
+    out.register_mustRememberPass = "Nu putem să îți resetăm parola dacă o uiți. Este foarte important să o ții minte! Bifează căsuța pentru a confirma.";
+    out.register_header = "Bine ai venit în CryptPad";
+    out.register_explanation = "<p>Hai să stabilim câteva lucruri, mai întâi</p><ul><li>Parola ta este cheia secretă care criptează toate pad-urile tale. Dacă pierzi/uiți parola nu există nici-o metodă prin care îți putem recupera datele.</li><li>Poți importa pad-uri care au fost vizionate recent în browser pentru a le avea în cont.</li><li>Dacă folosești un computer împărțit, trebuie să te deloghezi, închiderea taburilor nu este de ajuns.</li></ul>";
+    out.register_writtenPassword = "Mi-am notat numele de utilizator și parola, înaintează.";
+    out.register_cancel = "Întoarce-te";
+    out.register_warning = "Zero Knowledge înseamnă că noi nu îți putem recupera datele dacă îți pierzi parola.";
+    out.register_alreadyRegistered = "Acest user există deja, vrei să te loghezi?";
+    out.settings_title = "Setări";
+    out.settings_save = "Salvează";
+    out.settings_backupTitle = "Fă o copie de rezervă sau restaurează toate datele";
+    out.settings_backup = "Copie de rezervă";
+    out.settings_restore = "Restaurează";
+    out.settings_resetTitle = "Curăță-ți drive-ul";
+    out.settings_reset = "Îndepărtează toate fișierele și folderele din CryptPad-ul tău.";
+    out.settings_resetPrompt = "Această acțiune va indepărta toate pad-urile din drive-ul tău.<br>Ești sigur că vrei să continui?<br>Tastează “<em>Iubesc CryptPad</em>” pentru a confirma.";
+    out.settings_resetDone = "Drive-ul tău este acum gol!";
+    out.settings_resetError = "Text de verificare incorect. CryptPad-ul tău nu a fost schimbat.";
+    out.settings_resetTips = "Sfaturi în CryptDrive";
+    out.settings_resetTipsButton = "Resetează sfaturile disponibile în CryptDrive";
+    out.settings_resetTipsDone = "Toate sfaturile sunt vizibile din nou.";
+    out.settings_importTitle = "Importă pad-urile recente ale acestui browser n CryptDrive-ul meu";
+    out.settings_import = "Importă";
+    out.settings_importConfirm = "Ești sigur că vrei să imporți pad-urile recente ale acestui browser în contul tău de CryptDrive?";
+    out.settings_importDone = "Import complet";
+    out.settings_userFeedbackHint1 = "CryptPad oferă niște feedback foarte simplu serverului, pentru a ne informa cum putem să îți îmbunătățim experiența voastră.";
+    out.settings_userFeedbackHint2 = "Conținutul pad-ului tău nu va fi împărțit cu serverele.";
+    out.settings_userFeedback = "Activează feedback";
+    out.settings_anonymous = "Nu ești logat. Setările sunt specifice browser-ului.";
+    out.settings_publicSigningKey = "Cheia de semnătură publică";
+    out.settings_usage = "Uzaj";
+    out.settings_usageTitle = "Vezi dimensiunea totală a pad-urilor fixate în MB";
+    out.settings_pinningNotAvailable = "Pad-urile fixate sunt disponibile doar utilizatorilor înregistrați.";
+    out.settings_pinningError = "Ceva nu a funcționat";
+    out.settings_usageAmount = "Pad-urile tale fixate ocupă {0}MB";
+    out.settings_logoutEverywhereTitle = "Deloghează-te peste tot";
+    out.settings_logoutEverywhere = "Deloghează-te din toate sesiunile web";
+    out.settings_logoutEverywhereConfirm = "Ești sigur? Va trebui să te loghezi, din nou, pe toate device-urile tale.";
+    out.upload_serverError = "Eroare de server: fișierele tale nu pot fi încărcate la momentul acesta.";
+    out.upload_uploadPending = "Ai deja o încărcare în desfășurare. Anulezi și încarci noul fișier?";
+    out.upload_success = "Fișierul tău ({0}) a fost ncărcat și adăugat la drive-ul tău cu succes.";
+    out.main_p2 = "Acest proiect folosește <a href=\"http://ckeditor.com/\">CKEditor</a> Visual Editor, <a href=\"https://codemirror.net/\">CodeMirror</a>, și <a href=\"https://github.com/xwiki-contrib/chainpad\">ChainPad</a> un motor în timp real.";
+    out.main_howitworks_p1 = "CryptPad folosește o variantă a algoritmului de <a href=\"https://en.wikipedia.org/wiki/Operational_transformation\">Operational transformation</a> care este capabil să găsescă consens distribuit folosind <a href=\"https://bitcoin.org/bitcoin.pdf\">Nakamoto Blockchain</a>, o construcție popularizată de <a href=\"https://en.wikipedia.org/wiki/Bitcoin\">Bitcoin</a>. Astfel algoritmul poate evita nevoia ca serverul central să rezove conflicte, iar serverul nu este interesat de conținutul care este editat în pad.";
+    out.main_about_p2 = "Dacă ai orice fel de întrebare sau comentariu, poți să ne <a href=\"https://twitter.com/cryptpad\">dai un tweet</a>, semnalezi o problemă <a href=\"https://github.com/xwiki-labs/cryptpad/issues/\" title=\"index de probleme\">on github</a>, spui salut pe IRC (<a href=\"http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7\" title=\"freenode webchat\">irc.freenode.net</a>), sau <a href=\"research@xwiki.com\">trimiți un email</a>.";
+    out.main_info = "<h1>Colaborează în siguranță</h1><br> Dezvoltă-ți ideile împreună cu documentele partajate în timp ce tehnologia <strong>Zero Knowledge</strong> îți păstrează securitatea; chiar și de noi.";
+    out.main_howitworks = "Cum funcționează";
+    out.main_zeroKnowledge = "Zero Knowledge";
+    out.main_zeroKnowledge_p = "Nu trebuie să ne crezi că <em>nu ne uităm</em> la pad-urile tale, cu tehnologia revoluționară Zero Knowledge a CryptPad <em>nu putem</em>. Învață mai multe despre cum îți protejăm <a href=\"/privacy.html\" title='Intimitatea'>Intimitate și Securitate</a>.";
+    out.main_writeItDown = "Notează";
+    out.main_writeItDown_p = "Cele mai importante proiecte vin din idei mici. Notează-ți momentele de inspirație și ideile neașteptate pentru că nu știi niciodată care ar putea fi noua mare descoperire.";
+    out.main_share = "Partajează link-ul, partajează pad-ul";
+    out.main_share_p = "Dezvoltă-ți ideile împreună: organizează întâlniri eficiente, colaborează pe liste TODO și fă prezentări scurte cu toți prietenii tăi și device-urile tale.";
+    out.main_organize = "Organizează-te";
+    out.main_organize_p = "Cu CryptPad Drive, poți să stai cu ochii pe ce este important.  Folderele îți permit să ții evidența proiectelor tale și să ai o viziune globală asupra evoluției lucrurilor.";
+    out.tryIt = "Testează!";
+    out.main_richText = "Rich Text editor";
+    out.main_richText_p = "Editează texte complexe în mod colaborativ cu Zero Knowledge în timp real. <a href=\"http://ckeditor.com\" target=\"_blank\">CkEditor</a> application.";
+    out.main_code = "Editor cod";
+    out.main_code_p = "Editează cod din softul tău, în mod colaborativ, cu Zero Knowledge în timp real.<a href=\"https://www.codemirror.net\" target=\"_blank\">CodeMirror</a> application.";
+    out.main_slide = "Editor slide-uri";
+    out.main_slide_p = "Crează-ți prezentări folosind sintaxa Markdown, și afișează-le în browser-ul tău.";
+    out.main_poll = "Sondaj";
+    out.main_poll_p = "Plănuiește întâlniri sau evenimente, sau votează pentru cea mai bună soluție pentru problema ta.";
+    out.main_drive = "CryptDrive";
+    out.footer_applications = "Aplicații";
+    out.footer_contact = "Contact";
+    out.footer_aboutUs = "Despre noi";
+    out.about = "Despre";
+    out.privacy = "Privacy";
+    out.contact = "Contact";
+    out.terms = "ToS";
+    out.blog = "Blog";
+    out.policy_title = "Politica de confidențialitate CryptPad";
+    out.policy_whatweknow = "Ce știm despre tine";
+    out.policy_whatweknow_p1 = "Ca o aplicație care este găzduită online, CryptPad are acces la metadatele expuse de protocolul HTTP. Asta include adresa IP-ului tău, și alte titluri HTTP care pot fi folosite ca să identifice un browser. Poți să vezi ce informații împărtășește browser-ul tău vizitând <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending\" title=\"what http headers is my browser sending\">WhatIsMyBrowser.com</a>.";
+    out.policy_whatweknow_p2 = "Folosim <a href=\"https://www.elastic.co/products/kibana\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"platforma de analiză open source\">Kibana</a>, o platformă open source, pentru a afla mai multe despre utilizatorii noștri. Kibana ne spune despre cum ai găsit CryptPad, căutare  directă, printr-un motor de căutare, sau prin recomandare de la un alt serviciu online ca Reddit sau Twitter.";
+    out.policy_howweuse = "Cum folosim ce aflăm";
+    out.policy_howweuse_p1 = "Folosim aceste informații pentru a lua decizii mai bune în promovarea CryptPad, prin evaluarea eforturilor trecute care au fost de succes. Informațiile despre locația ta ne ajută să aflăm dacă ar trebui să oferim suport pentru alte limbi, pe lângă engleză.";
+    out.policy_howweuse_p2 = "Informațiile despre browser-ul tău (dacă este bazat pe un sistem de operare desktop sau mobil) ne ajută să luăm decizii când prioritizăm viitoarele îmbunătățiri. Echipa noastră de dezvoltare este mică, și încercăm să facem alegeri care să îmbunătățească experiența câtor mai mulți utilizatori.";
+
+    out.policy_whatwetell = "Ce le spunem altora despre tine";
+    out.policy_whatwetell_p1 = "Nu furnizăm informațiile obținute terților, decât dacă ne este cerut în mod legal.";
+    out.policy_links = "Link-uri către alte site-uri";
+    out.policy_links_p1 = "Acest site conține link-uri către alte site-uri, incluzându-le pe cele produse de alte organizații. Nu suntem responsabili pentru practicile de intimitate sau pentru conținutul site-urilor externe. Ca regulă generală, link-urile către site-uri externe sunt deschise ntr-o fereastră noup, pentru a face clar faptul că părăsiți CryptPad.fr.";
+    out.policy_ads = "Reclame";
+    out.policy_ads_p1 = "Nu afișăm nici o formă de publicitate online, dar s-ar putea să atașăm link-uri către instituțiile care ne finanțează cerecetarea.";
+    out.policy_choices = "Ce alegeri ai";
+    out.policy_choices_open = "Codul nostru este open source, așa că tu ai mereu posibilitatea de a-ți găzdui propria instanță de CryptPad.";
+    out.policy_choices_vpn = "Dacă vrei să folosești instanța găzduită de noi, dar nu vrei să îți expui IP-ul, poți să îl protejezi folosind <a href=\"https://www.torproject.org/projects/torbrowser.html.en\" title=\"downloads from the Tor project\" target=\"_blank\" rel=\"noopener noreferrer\">Tor browser bundle</a>, sau <a href=\"https://riseup.net/en/vpn\" title=\"VPNs provided by Riseup\" target=\"_blank\" rel=\"noopener noreferrer\">VPN</a>.";
+    out.policy_choices_ads = "Dacă vrei doar să blochezi platforma noastră de analiză, poți folosi soluții de adblocking ca <a href=\"https://www.eff.org/privacybadger\" title=\"download privacy badger\" target=\"_blank\" rel=\"noopener noreferrer\">Privacy Badger</a>.";
+    out.tos_title = "CryptPad Termeni de Utilizare";
+    out.tos_legal = "Te rugăm să nu fii rău intenționat, abuziv, sau să faci orice ilegal.";
+    out.tos_availability = "Sperăm că o să găsești acest serviciu util, dar disponibilitatea sau performanța nu poate fi garantată. Te rugăm să îți exporți datele n mod regulat.";
+    out.tos_e2ee = "Conținutul CryptPad poate fi citit sau modificat de oricine care poate ghici sau obține fragmentul identificator al pad-ului. Recomandăm să folosești soluții de comunicare criptate end-to-end-encrypted (e2ee) pentru a partaja link-uri, evitând orice risc în cazul unei scurgeri de informații.";
+    out.tos_logs = "Metadatele oferite de browser-ul tău serverului ar putea fi înscrise în scopul de a menține serviciul.";
+    out.tos_3rdparties = "Nu oferim date personale terților, decât dacă ne sunt solicitate prin lege.";
+    out.bottom_france = "<a href=\"http://www.xwiki.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Realizat cu <img class=\"bottom-bar-heart\" src=\"/customize/heart.png\" alt=\"love\" /> n <img class=\"bottom-bar-fr\" src=\"/customize/fr.png\" alt=\"Franța\" /></a>";
+    out.bottom_support = "<a href=\"http://labs.xwiki.com/\" title=\"XWiki Labs\" target=\"_blank\" rel=\"noopener noreferrer\">Un proiect al <img src=\"/customize/logo-xwiki2.png\" alt=\"XWiki SAS\" class=\"bottom-bar-xwiki\"/> Labs Project </a> cu susținerea <a href=\"http://ng.open-paas.org/\" title=\"OpenPaaS::ng\" target=\"_blank\" rel=\"noopener noreferrer\"> <img src=\"/customize/openpaasng.png\" alt=\"OpenPaaS-ng\" class=\"bottom-bar-openpaas\" /></a>";
+    out.header_france = "<a href=\"http://www.xwiki.com/\" target=\"_blank\" rel=\"noopener noreferrer\">With <img class=\"bottom-bar-heart\" src=\"/customize/heart.png\" alt=\"love\" /> from <img class=\"bottom-bar-fr\" src=\"/customize/fr.png\" title=\"Franța\" alt=\"Franța\"/> by <img src=\"/customize/logo-xwiki.png\" alt=\"XWiki SAS\" class=\"bottom-bar-xwiki\"/></a>";
+    out.header_support = "<a href=\"http://ng.open-paas.org/\" title=\"OpenPaaS::ng\" target=\"_blank\" rel=\"noopener noreferrer\"> <img src=\"/customize/openpaasng.png\" alt=\"OpenPaaS-ng\" class=\"bottom-bar-openpaas\" /></a>";
+    out.header_logoTitle = "Mergi la pagina principală";
+    out.initialState = "<span style=\"font-size:16px;\"><p>Acesta este&nbsp;<strong>CryptPad</strong>, editorul colaborativ bazat pe tehnologia Zero Knowledge în timp real. Totul este salvat pe măsură ce scrii.<br>Partajează link-ul către acest pad pentru a edita cu prieteni sau folosește <span class=\"fa fa-share-alt\" style=\"border:1px solid black;color:#000;\">&nbsp;Share&nbsp;</span> butonul pentru a partaja <em>read-only link</em>&nbsp;permițând vizualizarea dar nu și editarea.</p><p><em>Îndrăznește, începe să scrii...</em></p></span><p>&nbsp;<br></p>";
+    out.codeInitialState = "/*\n   Acesta este editorul colaborativ de cod bazat pe tehnologia Zero Knowledge CryptPad.\n   Ce scrii aici este criptat, așa că doar oamenii care au link-ul pot să-l acceseze.\n   Poți să alegi ce limbaj de programare pus n evidență și schema de culori UI n dreapta sus.\n*/";
+    out.slideInitialState = "# CryptSlide\n* Acesta este un editor colaborativ bazat pe tehnologia Zero Knowledge.\n* Ce scrii aici este criptat, așa că doar oamenii care au link-ul pot să-l acceseze.\n* Nici măcar serverele nu au acces la ce scrii tu.\n* Ce vezi aici, ce auzi aici, atunci când pleci, lași aici.\n\n-\n# Cum se folosește\n1. Scrie-ți conținutul slide-urilor folosind sintaxa markdown\n  - Află mai multe despre sintaxa markdown [aici](http://www.markdowntutorial.com/)\n2. Separă-ți slide-urile cu -\n3. Click pe butonul \"Play\" pentru a vedea rezultatele  - Slide-urile tale sunt actualizate în timp real.";
+    out.driveReadmeTitle = "Ce este CryptDrive?";
+    out.readme_welcome = "Bine ai venit n CryptPad !";
+    out.readme_p1 = "Bine ai venit în CryptPad, acesta este locul unde îți poți lua notițe, singur sau cu prietenii.";
+    out.readme_p2 = "Acest pad o să îți ofere un scurt ghid în cum poți să folosești CryptPad pentru a lua notițe, a le ține organizate și a colabora pe ele.";
+    out.readme_cat1 = "Descoperă-ți CryptDrive-ul";
+    out.readme_cat1_l1 = "Crează un pad: În CryptDrive-ul tău, dă click {0} apoi {1} și poți să creezi un pad.";
+    out.readme_cat1_l2 = "Deschide pad-urile din CryptDrive-ul tău: doublu-click pe iconița unui pad pentru a-l deschide.";
+    out.readme_cat1_l3 = "Organizează-ți pad-urile: Când ești logat, orice pad accesezi va fi afișat ca în secțiunea {0} a drive-ului tău.";
+    out.readme_cat1_l3_l1 = "Poți să folosești funcția click and drag pentru a muta fișierele în folderele secțiunii {0} a drive-ului tău și pentru a crea noi foldere.";
+    out.readme_cat1_l3_l2 = "Ține minte să încerci click-dreapta pe iconițe pentru că există și meniuri adiționale.";
+    out.readme_cat1_l4 = "Pune pad-urile vechi în gunoi. Poți să folosești funcția click and drag pe pad-uri în categoria {0} la fel ca și în cazul folderelor.";
+    out.readme_cat2 = "Crează pad-uri ca un profesionist";
+    out.edit = "editează";
+    out.view = "vezi";
+    out.readme_cat2_l1 = "Butonul {0} din pad-ul tău dă accesul colaboratorilor tăi să {1} sau să {2} pad-ul.";
+    out.readme_cat2_l2 = "Schimbă titlul pad-ului dând click pe creion";
+    out.readme_cat3 = "Descoperă aplicațiile CryptPad";
+    out.readme_cat3_l1 = "Cu editorul de cod CryptPad, poți colabora pe cod ca Javascript și markdown ca HTML și Markdown";
+    out.readme_cat3_l2 = "Cu editorul de slide-uri CryptPad, poți să faci prezentări scurte folosind Markdown";
+    out.readme_cat3_l3 = "Cu CryptPoll poți să organizezi votări rapide, mai ales pentru a programa ntâlniri care se potrivesc calendarelor tuturor";
+
+    out.tips = { };
+    out.tips.lag = "Iconița verde din dreapta-sus arată calitatea conexiunii internetului tău la serverele CryptPad.";
+    out.tips.shortcuts = "`ctrl+b`, `ctrl+i` and `ctrl+u` sunt scurtături pentru bold, italic și underline.";
+    out.tips.indentare = "În listele cu bulină sau cele numerotate, poți folosi  tab sau shift+tab pentru a mări sau micșora indentarea.";
+    out.tips.titlu = "Poți seta titlul pad-urilor tale prin click pe centru sus.";
+    out.tips.stocare = "De fiecare dată când vizitezi un pad, dacă ești logat va fi salvat pe CryptDrive-ul tău.";
+    out.tips.marker = "Poți sublinia text într-un pad folosind itemul \"marker\" n meniul de stiluri.";
+
+    out.feedback_about = "Dacă citești asta, probabil că ești curios de ce CryptPad cere pagini web atunci când întreprinzi anumite acțiuni";
+    out.feedback_privacy = "Ne pasă de intimitatea ta, si în același timp vrem să păstrăm CryptPad ușor de folosit.  Folosim acest fișier pentru a ne da seama care beneficii UI contează cel mai mult pentru utilizatori, cerându-l alături de un parametru specific atunci când acțiunea se desfășoară";
+    out.feedback_optout = "Dacă vrei să ieși, vizitează <a href='/settings/'>setările de pe pagina ta de user</a>, unde vei găsi o căsuță pentru a activa sau dezactiva feedback-ul de la user";
+
+    return out;
+});
--- a/customize.dist/translations/messages.zh.js
+++ b/customize.dist/translations/messages.zh.js
@ -0,0 +1,544 @@
+define(function () {
+    var out = {};
+    // translations must set this key for their language to be available in
+    // the language dropdowns that are shown throughout Cryptpad's interface
+
+    out._languageName = 'Chinese';  
+
+    out.main_title = "CryptPad: 零知識, 即時協作編寫";
+    out.main_slogan = "團結就是力量 - 合作是關鍵"; // TODO remove?
+
+    out.type = {};
+    out.type.pad = '富文本';
+    out.type.code = '編碼';
+    out.type.poll = '投票';
+    out.type.slide = '投影片簡報';
+    out.type.drive = '磁碟';
+    out.type.whiteboard = '白板';
+    out.type.file = '檔案';
+    out.type.media = '多媒體';
+
+    out.button_newpad = '富文件檔案';
+    out.button_newcode = '新代碼檔案';
+    out.button_newpoll = '新投票調查';
+    out.button_newslide = '新簡報';
+    out.button_newwhiteboard = '新白板';
+
+    // 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_0_common_connectionLost = "<b>伺服器連線中斷</b><br>現在是唯讀狀態，直到連線恢復正常。";
+    out.common_connectionLost = out.updated_0_common_connectionLost;
+
+    out.websocketError = '無法連結上 websocket 伺服器...';
+    out.typeError = "這個編輯檔與所選的應用程式並不相容";
+    out.onLogout = '你已登出, <a href="/" target="_blank">點擊這裏</a> 來登入<br>或按<em>Escape</em> 來以唯讀模型使用你的編輯檔案';
+    out.wrongApp = "無法在瀏覽器顯示即時期間的內容，請試著再重新載入本頁。";
+
+    out.loading = "載入中...";
+    out.error = "錯誤";
+    out.saved = "儲存";
+    out.synced = "所有資料已儲存好了";
+    out.deleted = "自 CryptDrive 刪除檔案";
+
+    out.disconnected = '已斷線';
+    out.synchronizing = '同步中';
+    out.reconnecting = '重新連結...';
+    out.lag = 'Lag';
+    out.readonly = '唯讀';
+    out.anonymous = "匿名";
+    out.yourself = "你自己";
+    out.anonymousUsers = "匿名的編輯群";
+    out.anonymousUser = "匿名的編輯群者";
+    out.users = "用戶";
+    out.and = "與";
+    out.viewer = "檢視者";
+    out.viewers = "檢視群";
+    out.editor = "編輯者";
+    out.editors = "編輯群";
+
+    out.language = "語言";
+
+    out.comingSoon = "即將上市...";
+
+    out.newVersion = '<b>CryptPad 已更新!</b><br>' +
+                     '檢查最新版本有什麼新功能:<br>'+
+                     '<a href="https://github.com/xwiki-labs/cryptpad/releases/tag/{0}" target="_blank">CryptPad新發佈記事 {0}</a>';
+
+    out.upgrade = "昇級";
+    out.upgradeTitle = "昇級帳戶以取得更多的儲存空間";
+    out.MB = "MB";
+    out.GB = "GB";
+    out.KB = "KB";
+
+    out.formattedMB = "{0} MB";
+    out.formattedGB = "{0} GB";
+    out.formattedKB = "{0} KB";
+
+    out.greenLight = "每件事都很順利";
+    out.orangeLight = "連線速度慢可能會影響用戶體驗";
+    out.redLight = "你這段期間的連線已中斷";
+
+    out.pinLimitReached = "你已達到儲存容量上限";
+    out.updated_0_pinLimitReachedAlert = "你已達到儲存容量上限，新檔案不會儲存到你的 CryptDrive.<br>" +
+        '要嘛你可以自 CryptDrive 移除原有文件或是 <a href="https://accounts.cryptpad.fr/#!on={0}" target="_blank">昇級到付費版</a>增加你的儲存容量。';
+    out.pinLimitReachedAlert = out.updated_0_pinLimitReachedAlert;
+    out.pinLimitNotPinned = "你已達到容量使用上限<br>"+
+                            "這個檔案無法儲存到你的 CryptDrive.";
+    out.pinLimitDrive = "你已達到容量使用上限<br>" +
+                        "你不能建立新的編輯檔案";
+    out.importButtonTitle = '從電腦上傳滙入檔案';
+
+    out.exportButtonTitle = '將這個檔案滙出到電腦';
+    out.exportPrompt = '你希望怎麼命名你的檔案?';
+
+    out.changeNamePrompt = '更換你的名稱(若留空白則會成為無名氏): ';
+    out.user_rename = "改變顯示名稱";
+    out.user_displayName = "顯示名稱";
+    out.user_accountName = "帳號名稱";
+
+    out.clickToEdit = "點擊以編輯";
+
+    out.forgetButtonTitle = '將這個檔案移置垃圾筒';
+    out.forgetPrompt = '點擊 OK 將把這個檔案移置垃圾筒，確定要這樣做嗎';
+    out.movedToTrash = '這個檔案已被移置垃圾筒<br><a href="/drive/">讀取我的雲端硬碟</a>';
+
+    out.shareButton = '分享';
+    out.shareSuccess = '複製連結到剪貼版';
+
+    out.newButton = '新';
+    out.newButtonTitle = '建立新的工作檔案';
+
+    out.saveTemplateButton = "存成模版";
+    out.saveTemplatePrompt = "為這個模版選一個標題";
+    out.templateSaved = "模版已儲存!";
+    out.selectTemplate = "選擇一個模版或是按 escape 跳出";
+
+    out.previewButtonTitle = "顯示或隱藏 Markdown 預覽模式";
+
+    out.presentButtonTitle = "輸入簡報模式";
+    out.presentSuccess = '按 ESC 以退出簡報模式';
+
+    out.backgroundButtonTitle = '改變簡報的顏色背景';
+    out.colorButtonTitle = '在簡報模式下改變文字顏色';
+
+    out.printButton = "列印 (enter)";
+    out.printButtonTitle = "列印投影片或滙出成 PDF 檔案";
+    out.printOptions = "版型選項";
+    out.printSlideNumber = "顯示投影片號碼";
+    out.printDate = "顯示日期";
+    out.printTitle = "顯示檔案標題";
+    out.printCSS = "自定風格規則 (CSS):";
+    out.printTransition = "啟用轉場動畫";
+
+    out.slideOptionsTitle = "自定你的投影片";
+    out.slideOptionsButton = "儲存 (enter)";
+
+    out.editShare = "編輯連結";
+    out.editShareTitle = "複製所編輯的連結到剪貼版";
+    out.editOpen = "在新分頁開啟連結編輯";
+    out.editOpenTitle = "在新分頁開啟這個檔案為編輯模式";
+    out.viewShare = "唯讀連結";
+    out.viewShareTitle = "複製唯讀的連結到剪貼版";
+    out.viewOpen = "在新分頁開啟唯讀連結";
+    out.viewOpenTitle = "在新分頁開啟這個檔案為唯讀模式";
+
+    out.notifyJoined = "{0} 已加入此協作期間";
+    out.notifyRenamed = "{0} 現在改名為 {1}";
+    out.notifyLeft = "{0} 已離開了這個協作期間";
+
+    out.okButton = 'OK (enter)';
+
+    out.cancel = "取消";
+    out.cancelButton = '取消 (esc)';
+
+    out.historyButton = "顯示文件歷史";
+    out.history_next = "到下一個版本";
+    out.history_prev = "到之前的版本";
+    out.history_goTo = "到所選擇的版本";
+    out.history_close = "回到";
+    out.history_closeTitle = "關閉歷史記錄";
+    out.history_restore = "重建";
+    out.history_restoreTitle = "將此文件重建到所挑選的版本";
+    out.history_restorePrompt = "確定要將這個展現的版本來取代現有版本嗎？";
+    out.history_restoreDone = "文件已重建";
+    out.history_version = "版本:";
+
+    // Polls
+
+    out.poll_title = "零知識日期挑選";
+    out.poll_subtitle = "零知識, <em>即時</em> 排程";
+
+    out.poll_p_save = "你的設定會立即更新, 因此從不需要按鍵儲存或擔心遺失。";
+    out.poll_p_encryption = "你所有幹入的資料都會予以加密，只有取得連結者才可以讀取它。即便是伺服器也不能看到你作了什麼變動。";
+
+    out.wizardLog = "點擊左上方的按鍵以回到你的調查";
+    out.wizardTitle = "使用精靈來建立調查投票";
+    out.wizardConfirm = "你真的要新增這些問題到你的調查中嗎?";
+
+    out.poll_publish_button = "發佈";
+    out.poll_admin_button = "管理者";
+    out.poll_create_user = "新增使用者";
+    out.poll_create_option = "新增選項";
+    out.poll_commit = "投入";
+
+    out.poll_closeWizardButton = "關閉協助精靈";
+    out.poll_closeWizardButtonTitle = "關閉協助精靈";
+    out.poll_wizardComputeButton = "計算最適化";
+    out.poll_wizardClearButton = "清除表格";
+    out.poll_wizardDescription = "透過輸入任何日期或時間分段，可自動建立一些選項";
+    out.poll_wizardAddDateButton = "+ 日期";
+    out.poll_wizardAddTimeButton = "+ 時間";
+
+    out.poll_optionPlaceholder = "選項";
+    out.poll_userPlaceholder = "你的名稱";
+    out.poll_removeOption = "確定要移除這個選項嗎?";
+    out.poll_removeUser = "確定要移除這位使用者嗎?";
+
+    out.poll_titleHint = "標題";
+    out.poll_descriptionHint = "請簡述這個調查目的，完成時使用「發佈鍵」。任何知道此調查連結者可以更改這裏的描述內容，但我們不鼓勵這麼做。.";
+
+    // Canvas
+    out.canvas_clear = "清除";
+    out.canvas_delete = "刪除所選";
+    out.canvas_disable = "取消繪圖";
+    out.canvas_enable = "啟動繪圖";
+    out.canvas_width = "寛度";
+    out.canvas_opacity = "透明度";
+
+    // File manager
+
+    out.fm_rootName = "根目錄";
+    out.fm_trashName = "垃圾桶";
+    out.fm_unsortedName = "未整理的檔案";
+    out.fm_filesDataName = "所有檔案";
+    out.fm_templateName = "模版";
+    out.fm_searchName = "搜尋";
+    out.fm_searchPlaceholder = "搜尋...";
+    out.fm_newButton = "新的";
+    out.fm_newButtonTitle = "建立新工作檔案或資料夾";
+    out.fm_newFolder = "新資料夾";
+    out.fm_newFile = "新工作檔案";
+    out.fm_folder = "資料夾";
+    out.fm_folderName = "資料夾名稱";
+    out.fm_numberOfFolders = "# 個資料夾";
+    out.fm_numberOfFiles = "# 檔案";
+    out.fm_fileName = "檔案名";
+    out.fm_title = "標題";
+    out.fm_type = "類型";
+    out.fm_lastAccess = "上回使用";
+    out.fm_creation = "創建";
+    out.fm_forbidden = "禁止的行為";
+    out.fm_originalPath = "原始路徑";
+    out.fm_openParent = "顯示在目錄夾中";
+    out.fm_noname = "無標題文件";
+    out.fm_emptyTrashDialog = "確定要清理垃圾筒嗎?";
+    out.fm_removeSeveralPermanentlyDialog = "確定要將這些 {0} 東西永自垃圾筒移除嗎？";
+    out.fm_removePermanentlyDialog = "你確定要永久地移除這些項目嗎？";
+    out.fm_removeSeveralDialog = "確定要將這些 {0} 東西移至垃圾筒嗎？";
+    out.fm_removeDialog = "確定要將移動 {0} 至垃圾筒嗎？";
+    out.fm_restoreDialog = "確定要重置 {0} 到它之前的位置嗎？";
+    out.fm_unknownFolderError = "所選或上回訪問的目錄不再存在了，正開啟上層目錄中...";
+    out.fm_contextMenuError = "無法在此元件下打開文本選單。如果這個問題一直發生，請試著重新載入此頁。";
+    out.fm_selectError = "無法選取目標的要素。如果這個問題一直發生，請試著重新載入此頁。";
+    out.fm_categoryError = "無法打開所選的類別，正在顯示根目錄。";
+    out.fm_info_root = "在此建立任何巢狀目錄夾以便於整理分類你的檔案。";
+    out.fm_info_unsorted = '包含所有你曾訪問過的檔案，其尚未被整理在 "根目錄" 或移到到"垃圾筒".'; // "My Documents" should match with the "out.fm_rootName" key, and "Trash" with "out.fm_trashName"
+    out.fm_info_template = '包含所有工作檔案已存成模版，便於讓你在建立新工作檔案時套用。';
+    out.updated_0_fm_info_trash = '清空垃圾筒好讓 CryptDrive 多出一些空間';
+    out.fm_info_trash = out.updated_0_fm_info_trash;
+    out.fm_info_allFiles = '包含在 "根目錄", "未整理的" 和 "垃圾筒" 裏的所有檔案。這裏你無法移動或移除檔案。'; // Same here
+    out.fm_info_anonymous = '你尚未登入，因此這些工作檔案可能會被刪除。 (<a href="https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/" target="_blank">了解原因</a>). ' +
+                            '<a href="/register/">註冊</a>或<a href="/login/">登入</a>以便保留它們。';
+    out.fm_alert_backupUrl = "這個雲端硬碟的備份連結<br>" +
+                             "<strong>高度建議</strong>把自己的 IP 資訊保留成只有自己知道<br>" +
+                             "萬一瀏覽器記憶被消除，你可以用它來接收所有的檔案。<br>" +
+                             "任何知道此連結的人可以編輯或移除你檔案管理底下的所有檔案。<br>";
+    out.fm_alert_anonymous = "嗨你好, 你目前正以匿名方式在使用 CryptPad , 這也沒問題，不過你的東西過一段時間沒動靜後，就會自動被刪除。 " +
+                             "匿名的用戶我們也取消其進階功能，因為我們要明確地讓用戶知道，這裏 " +
+                             '不是一個安全存放東西的地方。你可以 <a href="https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/" target="_blank">進一步了解 </a> 關於 ' +
+                             '為何我們這樣作，以及為何你最好能夠<a href="/register/">註冊</a> 以及 <a href="/login/">登錄</a>使用。';
+    out.fm_backup_title = '備份連結';
+    out.fm_nameFile = '你想要如何來命名這個檔案呢？';
+    out.fm_error_cantPin = "內部伺服器出錯，請重新載入本頁並再試一次。";
+    // File - Context menu
+    out.fc_newfolder = "新資料夾";
+    out.fc_rename = "重新命名";
+    out.fc_open = "打開";
+    out.fc_open_ro = "打開 (唯讀)";
+    out.fc_delete = "刪除";
+    out.fc_restore = "重置";
+    out.fc_remove = "永久刪除";
+    out.fc_empty = "清理垃圾筒";
+    out.fc_prop = "Properties";
+    out.fc_sizeInKilobytes = "容量大小 (Kilobytes)";
+    // fileObject.js (logs)
+    out.fo_moveUnsortedError = "你不能移動資料夾到未整理的工作檔案清單";
+    out.fo_existingNameError = "名稱已被使用，請選擇其它名稱";
+    out.fo_moveFolderToChildError = "你不能移動資料夾到它的子資料夾底下";
+    out.fo_unableToRestore = "無法將這個檔案重置到原始的位置。你可以試著將它移動到其它新位置。";
+    out.fo_unavailableName = "在新位置裏同名的檔案或資料夾名稱已存在，請重新命名後再試看看。";
+
+    // login
+    out.login_login = "登入";
+    out.login_makeAPad = '匿名地建立一個工作檔案';
+    out.login_nologin = "瀏覽本地的工作檔案";
+    out.login_register = "註冊";
+    out.logoutButton = "登出";
+    out.settingsButton = "設定";
+
+    out.login_username = "用戶名";
+    out.login_password = "密碼";
+    out.login_confirm = "確認你的密碼";
+    out.login_remember = "記住我";
+
+    out.login_hashing = "散列你的密碼中，這要花上一點時間";
+
+    out.login_hello = 'Hello {0},'; // {0} is the username
+    out.login_helloNoName = 'Hello,';
+    out.login_accessDrive = '取用你的磁碟';
+    out.login_orNoLogin = '或';
+
+    out.login_noSuchUser = '無效的用戶名或密碼，請再試一次或重新註冊';
+    out.login_invalUser = '要求用戶名';
+    out.login_invalPass = '要求密碼';
+    out.login_unhandledError = '發生了未預期的錯誤 :(';
+
+    out.register_importRecent = "滙入檔案記錄 (建議)";
+    out.register_acceptTerms = "我同意 <a href='/terms.html'>服務條款</a>";
+    out.register_passwordsDontMatch = "密碼不相符！";
+    out.register_mustAcceptTerms = "你必須同意我們的服務條款。";
+    out.register_mustRememberPass = "如果你忘了密碼，我們也無法為你重置。因此務必自行好好記住！ 請在勾選處勾選確認。";
+
+    out.register_header = "歡迎來到 CryptPad";
+    out.register_explanation = [
+        "<p>首先讓我們先了解幾件事</p>",
+        "<ul>",
+            "<li>你的密碼是你用來加密所有工作檔案的密鑰。一旦遺失它，我們也沒辦法幫你恢復你的資料。</li>",
+            "<li>你可以滙入近期在瀏覽器下檢視的工作檔案到你的雲端硬碟裏。</li>",
+            "<li>如果你使用的是公用分享電腦，你需要在完成工作後進行登出，只是關閉分頁是不夠的。</li>",
+        "</ul>"
+    ].join('');
+
+    out.register_writtenPassword = "我已記下了我的用戶名和密碼，請繼續";
+    out.register_cancel = "回去";
+
+    out.register_warning = "零知識表示如果你遺失了密碼,我們也無法還原你的資料";
+
+    out.register_alreadyRegistered = "這名用戶己存在了,你要登入嗎?";
+
+    // Settings
+    out.settings_title = "設定";
+    out.settings_save = "儲存";
+    out.settings_backupTitle = "備份或重建你所有的資料";
+    out.settings_backup = "備份";
+    out.settings_restore = "重建";
+    out.settings_resetTitle = "清除你的雲端硬碟";
+    out.settings_reset = "從你的 CryptDrive 移除所有的檔案和資料夾";
+    out.settings_resetPrompt = "這個動作會自你的雲端硬碟中移除所有工作檔案<br>"+
+                               "確定要繼續嗎？<br>" +
+                               "輸入 “<em>I love CryptPad</em>” 來確認。";
+    out.settings_resetDone = "你的目錄現已清空！";
+    out.settings_resetError = "不正確的認證文字，你的 CryptDrive 並未更改。";
+    out.settings_resetTips = "使用 CryptDrive 的竅門";
+    out.settings_resetTipsButton = "在 CryptDrive 下重置可用的訣竅";
+    out.settings_resetTipsDone = "所有的訣竅現在都可再次看到了。";
+
+    out.settings_importTitle = "滙入這個瀏覽器近期的工作檔案到我的 CryptDrive";
+    out.settings_import = "滙入";
+    out.settings_importConfirm = "確定要從這個瀏覽器滙入近期的工作檔案到你的 CryptDrive ？";
+    out.settings_importDone = "滙入完成";
+
+    out.settings_userFeedbackHint1 = "CryptPad 會提供一些基本的反饋到伺服器，以讓我們知道如何改善用戶體驗。";
+    out.settings_userFeedbackHint2 = "你的工作檔案內容絕不會被分享到伺服器";
+    out.settings_userFeedback = "啟用用戶反饋功能";
+
+    out.settings_anonymous = "你尚未登入，在此瀏覽器上進行特別設定。";
+    out.settings_publicSigningKey = "公開金鑰簽署";
+
+    out.settings_usage = "用法";
+    out.settings_usageTitle = "查看所有置頂的工作檔案所佔的容量";
+    out.settings_pinningNotAvailable = "工作檔案置頂功能只開放給已註冊用戶";
+    out.settings_pinningError = "有點不對勁";
+    out.settings_usageAmount = "你置頂的工作檔案佔了 {0}MB";
+
+    out.settings_logoutEverywhereTitle = "自所有地點登出";
+    out.settings_logoutEverywhere = "自所有其它的網頁期間登出";
+    out.settings_logoutEverywhereConfirm = "你確定嗎？你將需要登入到所有用到設置。";
+
+    out.upload_serverError = "伺服器出錯：本次無法上傳你的檔案";
+    out.upload_uploadPending = "你欲上傳檔案正在傳輸中，要取消並上傳新檔案嗎？";
+    out.upload_success = "你的檔案 ({0}) 已成功地上傳並放入到你的網路磁碟中。";
+    out.upload_notEnoughSpace = "你的 CryptDrive 無足夠空間來存放這個檔案。";
+    out.upload_tooLarge = "此檔案超過了上傳單一檔案可允許的容量上限。";
+    out.upload_choose = "選擇一個檔案";
+    out.upload_pending = "待處理";
+    out.upload_cancelled = "已取消的";
+    out.upload_name = "檔案名";
+    out.upload_size = "大小";
+    out.upload_progress = "進度";
+    out.download_button = "解密 & 下載";
+
+    // general warnings
+    out.warn_notPinned = "這個工作檔案並不在任何人的 CryptDrive 裏，它將在 3 個月到期後刪除。 <a href='/about.html#pinning'>進一步了解...</a>";
+
+    // index.html
+
+
+    //about.html
+    out.main_p2 = '本專案使用 <a href="http://ckeditor.com/">CKEditor</a> 視覺編輯器, <a href="https://codemirror.net/">CodeMirror</a>, 以及 <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> 即時引擊。';
+    out.main_howitworks_p1 = 'CryptPad 應用一種變體的 <a href="https://en.wikipedia.org/wiki/Operational_transformation">操作型變換 Operational transformation</a> 演算法，它利用<a href="https://bitcoin.org/bitcoin.pdf">Nakamoto Blockchain</a>來找到分散的共識, Nakamoto Blockchain 是一種建構當前流行的<a href="https://en.wikipedia.org/wiki/Bitcoin">比特幣</a>。這套演算法可避免需要一個中央的伺服器來解析操作型變換編輯衝突，而無須處理解析衝突，伺服器並不知道哪一個檔案被編輯。';
+
+    // contact.html
+    out.main_about_p2 = '若有任何問題和建議, 可以在<a href="https://twitter.com/cryptpad">tweet us</a>, <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">github</a>提出問題, 或是來到 irc (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>)打聲招呼, 再或者 <a href="mailto:research@xwiki.com">寄封電郵給我們</a>.';
+
+    out.main_info = "<h1>Collaborate in Confidence</h1><br> 利用共同享文件發嚮點子，透過 <strong>零知識 </strong> 科技確保隱私安全; 對任何網路服務商都要加以提防。";
+
+    out.main_howitworks = '它如何運作';
+    out.main_zeroKnowledge = '零知識';
+    out.main_zeroKnowledge_p = "你不必相信我們所說的<em>並不會</em> 察看你的檔案, CryptPad 革命性的零知識技術讓我們 <em>真的不能看到</em>。 進一步了解在這裏，我們如何保護用戶的 <a href=\"/privacy.html\" title='Privacy'>隱私和安全</a>。";
+    out.main_writeItDown = '寫下它';
+    out.main_writeItDown_p = "偉大的專案來自不起眼的小點子。記下靈感與點子的瞬間，因為你從不會知道哪個會帶來重大突破。";
+    out.main_share = '分享連結, 分享工作檔案';
+    out.main_share_p = "一起來發響想法點子: 在任何設備上，與朋友一起執行有效率的會議, 協作待辦清單與快速製作簡報。";
+    out.main_organize = 'Get organized';
+    out.main_organize_p = "利用 CryptPad 空間, 你可以保留看管重要的東西。資料夾讓你可以追踪專案和全盤了解事情的走向狀況。";
+    out.tryIt = 'Try it out!';
+    out.main_richText = '富文字編輯器';
+    out.main_richText_p = '利用我們的即時零知識技術，集體協作地編輯富文本檔案 <a href="http://ckeditor.com" target="_blank">CkEditor</a> 應用程式application.';
+    out.main_code = '代碼編輯器';
+    out.main_code_p = '利用我們的即時零知識技術，集體協作地編輯程式代碼 <a href="https://www.codemirror.net" target="_blank">CodeMirror</a> 應用程式。';
+    out.main_slide = '投影片編輯器';
+    out.main_slide_p = '使用 Markdown 語法來建立投影片，並利用瀏覽器來展示投影片。';
+    out.main_poll = '調查';
+    out.main_poll_p = '規劃會議或活動，或是為問題舉行投最佳方案的投票。';
+    out.main_drive = 'CryptDrive';
+
+    out.footer_applications = "應用程式";
+    out.footer_contact = "聯繫";
+    out.footer_aboutUs = "關於 Cryptpad";
+
+    out.about = "關於";
+    out.privacy = "隱私";
+    out.contact = "聯繫";
+    out.terms = "服務條款";
+    out.blog = "Blog";
+
+    // privacy.html
+
+    out.policy_title = 'CryptPad 隱私政策';
+    out.policy_whatweknow = '我們會知道哪些關於你的資料';
+    out.policy_whatweknow_p1 = '作為一個網頁上的應用程式, CryptPad 可以接取 HTTP 協議所曝露的元數據。 這包括你的 IP 地址、各式其它的 HTTP 標頭，其用於識別你特定的瀏覽器。 你可以訪問 <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>這個網站，知道你的瀏覽器分享了哪些資訊。';
+    out.policy_whatweknow_p2 = '我們使用 <a href="https://www.elastic.co/products/kibana" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Kibana</a>, 它是一個開源的流量數據分析平台, 以更了解用戶。Kibana 讓我們知道你是如何地發現 CryptPad, 是透過直接接入、攑搜尋引擊或是其它網站的介紹如 Reddit 和 Twitter。';
+    out.policy_howweuse = '我們如何利用我們知道的東西';
+    out.policy_howweuse_p1 = '我們利用這些資訊評估過去成功的效果，以更佳地決定如何推廣 CryptPad。有關你地理位置的資訊讓我們知道是否該提供英語之外的語言版本支援';
+    out.policy_howweuse_p2 = "有關你的瀏覽器資訊 (是桌面還是手機操作系統) 有助於讓我們決定要優先哪些功能改善。我們開發團隊人很少，我們試著挑選盡可能地提昇更多用戶的使用體驗。";
+    out.policy_whatwetell = '我們可以告訴別人關於你的哪些資料';
+    out.policy_whatwetell_p1 = '我們不會給第三人我們所收集的資訊，除非被依法要求配合。';
+    out.policy_links = '其它網站連結';
+    out.policy_links_p1 = '本站含有其它網站的連結，包括其它組織的産品。我們無法對這些隱私實踐或任何本站以外的內容負責。一般而言，連到外站的連結會另啟新視窗，以明確讓你知道已離開了CryptPad.fr.';
+    out.policy_ads = '廣告';
+    out.policy_ads_p1 = '我們不會放置任何線上廣告，但會提供一些資助我們研究的機構與團體的網址連結';
+    out.policy_choices = '你有的選擇';
+    out.policy_choices_open = '我們的代碼是開放的，你可以選擇自行在自己的機器上來架設自己的 CryptPad.';
+    out.policy_choices_vpn = '如果你要使用我們架設的服務, 但不希望曝露自己的 IP 地址, 你可以利用<a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads from the Tor project" target="_blank" rel="noopener noreferrer">Tor 瀏覽器套件</a>來保護隱藏 IP 地址, 或是使用 <a href="https://riseup.net/en/vpn" title="VPNs provided by Riseup" target="_blank" rel="noopener noreferrer">VPN</a>。';
+    out.policy_choices_ads = '如果你只是想要封鎖我們的數據分析器, 你可以使用廣告封鎖工具如 <a hre="https://www.eff.org/privacybadger" title="download privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';
+
+    // terms.html
+
+    out.tos_title = "CryptPad 服務條款";
+    out.tos_legal = "請不要惡意、濫用或從事非法活動。";
+    out.tos_availability = "希望你覺得我們的産品與服務對你有所幫助, 但我們並不能一直百分百保證它的表現穩定與可得性。請記得定期滙出你的資料。";
+    out.tos_e2ee = "CryptPad 的內容可以被任何猜出或取得工作檔案分段識別碼的人讀取與修改。我們建議你使用端對端加密 (e2ee) 訊息技術來分享工作檔案連結 以及假設如果一旦連結外漏不會背上任何責任。";
+    out.tos_logs = "你的瀏覽器提供給伺服器的元數據，可能會因為維護本服務之效能而被收集記錄。";
+    out.tos_3rdparties = "除非法令要求，我們不會提供任何個人資料給第三方。";
+
+    // BottomBar.html
+
+    out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Made with <img class="bottom-bar-heart" src="/customize/heart.png" alt="love" /> in <img class="bottom-bar-fr" src="/customize/fr.png" alt="France" /></a>';
+    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">An <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs Project </a> with the support of <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+
+    // Header.html
+
+    out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">With <img class="bottom-bar-heart" src="/customize/heart.png" alt="love" /> from <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> by <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+
+    out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+    out.header_logoTitle = '回到主頁';
+
+    // Initial states
+
+    out.initialState = [
+        '<span style="font-size:16px;"><p>',
+        '這是&nbsp;<strong>CryptPad</strong>, 零知識即時協作編輯平台，當你輸入時一切已即存好。',
+        '<br>',
+        '分享這個工作檔案的網址連結給友人或是使用、 <span class="fa fa-share-alt" style="border: 1px solid black;color:#000;">&nbsp;分享&nbsp;</span> 按鈕分享<em>唯讀的連結</em>&nbsp;其只能看不能編寫。',
+        '</p>',
+
+        '<p><em>',
+        '來吧, 開始打字輸入吧...',
+        '</em></p></span>',
+        '<p>&nbsp;<br></p>'
+    ].join('');
+
+    out.codeInitialState = [
+        '# CryptPad 零知識即時協作代碼編輯平台\n',
+        '\n',
+        '* 你所輸入的東西會予以加密，僅有知道此網頁連結者可以接取這份文件。\n',
+        '* 你可以在右上角選擇欲編寫的程式語言以及樣版配色風格。'
+    ].join('');
+
+    out.slideInitialState = [
+        '# CryptSlide\n',
+        '* 它是零知識即時協作編輯平台。\n',
+        '* 你所輸入的東西會予以加密，僅有知道此網頁連結者可以接取這份文件。\n',
+        '* 即便是本站伺服器也不知道你輸入了什麼內容。\n',
+        '* 你在這裏看到的、你在這裏聽到的、當你離開本站時，讓它就留在這裏吧。\n',
+        '\n',
+        '---',
+        '\n',
+        '# 如何使用\n',
+        '1. 使用 markdown 語法來寫下你的投影片內容\n',
+        '  - 進一步學習 markdown 語法 [here](http://www.markdowntutorial.com/)\n',
+        '2. 利用 --- 來區隔不同的投影片\n',
+        '3. 點擊下方 "Play" 鍵來查看成果',
+        '  - 你的投影片會即時更新'
+    ].join('');
+
+    // Readme
+
+    out.driveReadmeTitle = "什麼是 CryptDrive?";
+    out.readme_welcome = "歡迎來到 CryptPad !";
+    out.readme_p1 = "歡迎來到 CryptPad, 這裏你可以獨自作個人筆記或是和別人共享協作。";
+    out.readme_p2 = "這個工作檔案可以讓你快速地了解如何使用 CryptPad 作筆記，有效地整理管理文件工作檔案。";
+    out.readme_cat1 = "認識如何使用 CryptDrive";
+    out.readme_cat1_l1 = "建立一個工作檔案: 在 CryptDrive 底下, 點擊 {0} 然後 {1} 這樣就可以建立一個新的工作檔案。"; // 0: New, 1: Rich Text
+    out.readme_cat1_l2 = "從 CryptDrive 開啟工作檔案: 雙擊工作檔案的圖示來開啟它。";
+    out.readme_cat1_l3 = "分類你的工作檔案：登入之後，每一個你能接取使用的工作檔案會顯示在你雲端硬碟中的 {0} 部份。"; // 0: Unsorted files
+    out.readme_cat1_l3_l1 = "你可以點擊或是拉曳檔案到雲端硬碟 {0} 區，新增資料夾。"; // 0: Documents
+    out.readme_cat1_l3_l2 = "記得試著點擊圖示，以顯示更多的選項功能。";
+    out.readme_cat1_l4 = "把舊的工作檔案放到垃圾筒：點擊或是拉曳檔案到 {0} 如同把它們拉到文件目錄夾一樣的方法。"; // 0: Trash
+    out.readme_cat2 = "像個專業人士來編寫你的工作檔案";
+    out.edit = "編輯";
+    out.view = "檢視";
+    out.readme_cat2_l1 = "在工作檔案下的 {0} 按鍵可讓其它的協作者接取 {1} 或是 {2} 工作檔案"; // 0: Share, 1: edit, 2: view
+    out.readme_cat2_l2 = "若要更改工作檔案的名稱，只要點擊右上的鉛筆圖示即可";
+    out.readme_cat3 = "發現其它的 CryptPad 應用";
+    out.readme_cat3_l1 = "使用 CryptPad 代碼編輯器，你可以和其它人協作各種程式碼，如 Javascript、 markdown、 HTML 等等。";
+    out.readme_cat3_l2 = "使用 CryptPad 投影片編輯功能，你可以使用 Markdown 快速製作簡報檔。";
+    out.readme_cat3_l3 = "利用 CryptPoll 你可以快速作個線上調查，尤其是調查每個人有空的會議時間。";
+
+    // Tips
+    out.tips = {};
+    out.tips.lag = "右上角的綠色圖標顯示你連線至 CryptPad 伺服器的連線品質。";
+    out.tips.shortcuts = "`ctrl+b`, `ctrl+i` 和 `ctrl+u` 分別是粗體字、斜體、與加底線用法的快速鍵。";
+    out.tips.indent = "要使用數字以及符號列表, 可使用 tab 或 shift+tab 快速地增加或滅少縮排指令。";
+    out.tips.title = "點擊正上方來設定工作檔案的標題。";
+    out.tips.store = "每一回你造訪一個工作檔案, 如果是登入狀態，則這些檔案會自動儲存到你的 CryptDrive.";
+    out.tips.marker = "在格式下拉選單中使用 \"marker\" 可以標注反亮文字.";
+
+    out.feedback_about = "如果你讀了這裏，也許會好奇為何當你執行某些動作時 CryptPad 會請求網頁資訊。";
+    out.feedback_privacy = "我們注重你的隱私，同時也要讓 CryptPad 容易使用。我們利用這個檔案來了解哪一種介面設計為用戶所重視，透過它來請求特別的功能參數。";
+    out.feedback_optout = "如果欲退出客戶資料收集, 請到 <a href='/settings/'>用戶設定頁</a>, 可以找到勾選項目來啟用或關閉用戶回饋功能。";
+
+    return out;
+});
+
--- a/customize.dist/user.js
+++ b/customize.dist/user.js
@ -1,190 +0,0 @@
-define([
-    '/api/config?cb=' + Math.random().toString().slice(2),
-    '/customize/messages.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
-    '/bower_components/chainpad-crypto/crypto.js',
-    '/customize/store.js',
-
-    '/bower_components/scrypt-async/scrypt-async.min.js',
-    '/bower_components/tweetnacl/nacl-fast.min.js',
-], function (Config, Messages, Listmap, Crypto, Store) {
-    var Scrypt = window.scrypt;
-    var Nacl = window.nacl;
-
-    var User = {};
-    var localKey = User.localKey = 'cryptpad_user_session';
-    var store;
-
-    Store.ready(function (err, s) {
-        if (err) {
-            console.error(err);
-            return;
-        }
-        store = s;
-    });
-
-    var isArray = function (o) { return Object.prototype.toString.call(o) === '[object Array]'; };
-
-    var session = User.session = function (secret, cb) {
-        if (secret) {
-            store.set(localKey, secret, cb);
-            return;
-        }
-        if (secret === null) {
-            store.remove(localKey, cb);
-        }
-
-        store.get(localKey, cb);
-    };
-
-    /*  64 uint8s symmetric keys
-          32 b64 channel
-            16 b64 key
-            16 b64 junk
-        32 uint8s ed signing key
-        32 uint8s curve public key */
-    var parse128 = function (A) {
-        if (A.length !== 128) {
-            throw new Error("Expected 128 uint8s!");
-        }
-        var symmetric = Nacl.util.encodeBase64(A.slice(0, 36));
-        return {
-            ed: A.slice(96),
-            curve: A.slice(64, 96),
-            channel: symmetric.slice(0, 32),
-            key: symmetric.slice(32),
-            extra: A.slice(36, 64),
-        };
-    };
-
-    var initialize = User.initialize = function (proxy, secret, cb) {
-        proxy.on('ready', function (info) {
-            var now = ''+new Date();
-            // old atime
-            var otime = proxy.atime;
-
-            var atime = proxy.atime = now;
-
-            // creation time
-            proxy.ctime = proxy.ctime || now;
-
-            proxy.username = proxy.username || secret.username;
-            proxy.schema = proxy.schema || 'login_data-v0';
-
-            proxy.documents = proxy.documents || [];
-            cb(void 0, proxy);
-        });
-    };
-
-    /*
-        cb(proxy);
-    */
-    var connect = User.connect = function (secret, cb) {
-        if (!secret) {
-            // FIXME
-            return;
-        }
-        var config = {
-            websocketURL: Config.websocketURL,
-            channel: secret.channel,
-            data: {},
-            crypto: Crypto.createEncryptor(secret.key),
-            logLevel: 0,
-        };
-        var rt = Listmap.create(config);
-        initialize(rt.proxy, secret, cb);
-    };
-
-    var disconnect = User.disconnect = function (cb) {
-        var err = "User.disconnect is not implemented yet";
-        cb(err);
-    };
-
-    var genSecret = User.genSecret = function (uname, pw, cb) {
-        Scrypt(pw,
-            uname,
-            15, // memory cost parameter
-            8, // block size parameter
-            128, // derived key length
-            200, // interruptStep
-            function (bytes) {
-                var secret = parse128(bytes);
-                secret.username = uname;
-                cb(void 0, secret);
-        });
-    };
-
-    /*  Asynchronously derive 128 random uint8s given a uname and password
-
-        cb(proxy, secret)
-    */
-    var login = User.login = function (uname, pw, cb) {
-        genSecret(uname, pw, function (err, secret) {
-            session(secret, function (err) {
-                connect(secret, cb);
-            });
-        });
-    };
-
-    var prepareStore = User.prepareStore = function (proxy) {
-        var store = {};
-
-        var ps = proxy.store = proxy.store || {};
-
-        var set = store.set = function (key, val, cb) {
-            ps[key] = val;
-            cb();
-        };
-
-        var batchset = store.setBatch = function (map, cb) {
-            if (isArray(map) || typeof(map) !== 'object') {
-                cb('[setBatch.TypeError] expected key-value pairs to set');
-                return;
-            }
-            Object.keys(map).forEach(function (k) {
-                ps[k] = map[k];
-            });
-            cb();
-        };
-
-        var get = store.get = function (key, cb) {
-            cb(void 0, ps[key]);
-        };
-
-        var batchget = store.getBatch = function (keys, cb) {
-            if (!isArray(keys)) {
-                cb('[getBatch.TypeError] expected array of keys to return');
-                return;
-            }
-            var map = {};
-            keys.forEach(function (k) {
-                map[k] = ps[k];
-            });
-            cb(void 0, map);
-        };
-
-        var remove = store.remove = function (key, cb) {
-            ps[key] = undefined;
-            cb();
-        };
-
-        var batchremove = store.removeBatch = function (keys, cb) {
-            if (!isArray(keys)) {
-                cb('[batchremove.TypeError] expected array of keys to remove');
-                return;
-            }
-            keys.forEach(function (k) {
-                ps[k] = undefined;
-            });
-            cb();
-        };
-
-        var keys = store.keys = function (cb) {
-            cb(void 0, Object.keys(ps));
-        };
-
-        return store;
-    };
-
-    return User;
-});
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,23 @@
+version: '2'
+services:
+
+  cryptpad:
+    build:
+      context: .
+      args:
+        - VERSION=${VERSION}
+    image: "xwiki/cryptpad:${VERSION}"
+    hostname: cryptpad
+
+    labels:
+      - traefik.port=3000
+      - traefik.frontend.passHostHeader=true
+    environment:
+      - USE_SSL=${USE_SSL}
+      - STORAGE=${STORAGE}
+      - LOG_TO_STDOUT=${LOG_TO_STDOUT}
+
+    restart: always
+    volumes:
+      - ./data/files:/cryptpad/datastore:rw
+      - ./data/customize:/cryptpad/customize:rw
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 13"><defs><style>.cls-1{fill:#444;}</style></defs><title>Asset 2</title><g id="Layer_2" data-name="Layer 2"><g id="_490_Icons" data-name="490 Icons"><path class="cls-1" d="M7,0,9,2h7V13H0V0Z"/></g></g></svg>`
				`@ -1,2 +0,0 @@`
				<a href="https://github.com/xwiki-labs/cryptpad" class="github-corner" title="Star it, Fork it, or submit issues on Github!" target="_blank"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style><!-- Thanks! http://tholman.com/github-corners/ -->