Merge branch 'develop' into t3chguy/electron_profiles

.gitignore

@@ -12,5 +12,8 @@
 /.npmrc
 .DS_Store
 npm-debug.log
+electron/dist
+electron/pub
+/.idea
 /config.json
 /src/component-index.js

README.md

@@ -281,6 +281,19 @@ If any of these steps error with, `file table overflow`, you are probably on a m
 which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
 You'll need to do this in each new terminal you open before building Riot.
 
+How to add a new translation?
+=============================
+
+[<img src="https://translate.nordgedanken.de/widgets/riot-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
+
+
+Head to the [translating doc](docs/translating.md)
+
+Adding Strings to the translations (Developer Guide)
+====================================================
+
+Head to the [translating dev doc](docs/translating-dev.md)
+
 Triaging issues
 ===============
 
@@ -300,7 +313,7 @@ bug or feature:
 * feature
 
 bug severity:
-  
+
 * cosmetic - feature works functionally but UI/UX is broken
 * critical - whole app doesn't work
 * major - entire feature doesn't work

docs/translating-dev.md

@@ -0,0 +1,26 @@
+# How to translate riot-web (Dev Guide)
+
+## Requirements
+
+- A working [Development Setup](../../#setting-up-a-dev-environment)
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Adding new strings
+
+1. Check if the import ``import _t from 'counterpart-riot'`` is present. If not add it to the other import statements.
+2. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method)
+3. Add the String to the ``en_EN.json`` file in ``src/i18n`` or if you are working in matrix-react-sdk you can find the json file in ``src/i18n/strings``
+
+## Adding variables inside a string.
+
+1. Extend your ``_t()`` call. Instead of ``_t(STRING)`` use ``_t(STRING, {})``
+2. Decide how to name it. Please think about if the person who has to translate it can understand what it does.
+3. Add it to the array in ``_t`` for example ``_t(STRING, {variable: this.variable})``
+4. Add the variable inside the string. The syntax for variables is ``%(variable)s``. Please note the s at the end. The name of the variable has to match the previous used name.
+
+## Things to know/Style Guides
+
+- Do not use it inside ``getDefaultProps`` at the point where ``getDefaultProps`` is initialized the translations aren't loaded yet and it causes missing translations.
+- If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded.
+- If a string is presented in the UI with punctuation like a full stop, include this in the translation strings, since punctuation varies between languages too.

docs/translating.md

@@ -0,0 +1,64 @@
+# How to translate riot-web
+
+## Requirements
+
+- Web Browser
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Step 0: Join #riotweb-translations:matrix.org
+
+1. Come and join https://riot.im/develop/#/room/#riotweb-translations:matrix.org
+2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)
+
+## Step 1: Preparing your Weblate Profile
+
+1. Head to https://translate.nordgedanken.de and register either via Github or email
+2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
+3. Log into weblate
+4. Head to https://translate.nordgedanken.de/accounts/profile/ and select the languages you know and maybe another language you know too.
+6. Head to https://translate.nordgedanken.de/accounts/profile/#subscriptions and select Riot Web as Project
+
+## How to check if your language already is being translated
+
+Go to https://translate.nordgedanken.de/projects/riot-web/ and visit the 2 sub-projects.
+If your language is listed go to Step 2a and if not go to Step 2b
+
+## Step 2a: Helping on existing languages.
+
+1. Head to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
+2. Click on the ``translate`` button on the right side of your language
+3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.
+
+Head to the explanations under Steb 2b
+
+## Step 2b: Adding a new language
+
+1. Go to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
+2. Click the ``Start new language`` button at the bottom
+3. Select a language
+4. Start translating like in 2a.3
+5. Repeat these steps for the other projects which are listed at the link of step 2b.1
+
+### What means the green button under the text field?
+
+The green button let you save our translations directly. Please only use it if you are 100% sure about that translation. If you do not know a translation please DO NOT click that button. Use the arrows above the translations field and click to the right.
+
+### What means the yellow button under the text field?
+
+The yellow button has to be used if you are unsure about the translation but you have a rough idea. It adds a new suggestion to the string which can than be reviewed by others.
+
+### What are "%(something)s"?
+
+These things are variables that are expanded when displayed by Riot. They can be room names, usernames or similar. If you find one, you can move to the right place for your language, but not delete it as the variable will be missing if you do.
+
+A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `<a href="/somewhere">` and `</a>`.  You must keep these markers surrounding the equivalent string in your language that needs to be hyperlinked.
+
+### "I want to come back to this string. How?"
+
+You can use inside the translation field "Review needed" checkbox. It will be shown as Strings that need to be reviewed.
+
+
+### Further reading
+
+The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html

electron_app/src/electron-main.js

@@ -1,5 +1,3 @@
-// @flow
-
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
@@ -20,15 +18,14 @@ limitations under the License.
 // Squirrel on windows starts the app with various flags
 // as hooks to tell us when we've been installed/uninstalled
 // etc.
-const check_squirrel_hooks = require('./squirrelhooks');
-if (check_squirrel_hooks()) return;
+const checkSquirrelHooks = require('./squirrelhooks');
+if (checkSquirrelHooks()) return;
 
 const argv = require('minimist')(process.argv);
 const electron = require('electron');
 
 const tray = require('./tray');
-
-const VectorMenu = require('./vectormenu');
+const vectorMenu = require('./vectormenu');
 const webContentsHandler = require('./webcontents-handler');
 
 const windowStateKeeper = require('electron-window-state');
@@ -53,6 +50,47 @@ const INITIAL_UPDATE_DELAY_MS = 30 * 1000;
 let mainWindow = null;
 let appQuitting = false;
 
+function safeOpenURL(target) {
+    // openExternal passes the target to open/start/xdg-open,
+    // so put fairly stringent limits on what can be opened
+    // (for instance, open /bin/sh does indeed open a terminal
+    // with a shell, albeit with no arguments)
+    const parsedUrl = url.parse(target);
+    if (PERMITTED_URL_SCHEMES.indexOf(parsedUrl.protocol) > -1) {
+        // explicitly use the URL re-assembled by the url library,
+        // so we know the url parser has understood all the parts
+        // of the input string
+        const newTarget = url.format(parsedUrl);
+        electron.shell.openExternal(newTarget);
+    }
+}
+
+function onWindowOrNavigate(ev, target) {
+    // always prevent the default: if something goes wrong,
+    // we don't want to end up opening it in the electron
+    // app, as we could end up opening any sort of random
+    // url in a window that has node scripting access.
+    ev.preventDefault();
+    safeOpenURL(target);
+}
+
+function onLinkContextMenu(ev, params) {
+    const popupMenu = new electron.Menu();
+
+    popupMenu.append(new electron.MenuItem({
+        label: params.linkURL,
+        click() { safeOpenURL(params.linkURL); },
+    }));
+
+    popupMenu.append(new electron.MenuItem({
+        label: 'Copy Link Address',
+        click() { electron.clipboard.writeText(params.linkURL); },
+    }));
+
+    popupMenu.popup();
+    ev.preventDefault();
+}
+
 function installUpdate() {
     // for some reason, quitAndInstall does not fire the
     // before-quit event, so we need to set the flag here.
@@ -64,13 +102,13 @@ function pollForUpdates() {
     try {
         electron.autoUpdater.checkForUpdates();
     } catch (e) {
-        console.log("Couldn't check for update", e);
+        console.log('Couldn\'t check for update', e);
     }
 }
 
-function startAutoUpdate(update_base_url) {
-    if (update_base_url.slice(-1) !== '/') {
-        update_base_url = update_base_url + '/';
+function startAutoUpdate(updateBaseUrl) {
+    if (updateBaseUrl.slice(-1) !== '/') {
+        updateBaseUrl = updateBaseUrl + '/';
     }
     try {
         // For reasons best known to Squirrel, the way it checks for updates
@@ -78,7 +116,7 @@ function startAutoUpdate(update_base_url) {
         // hits a URL that either gives it a 200 with some json or
         // 204 No Content. On windows it takes a base path and looks for
         // files under that path.
-        if (process.platform == 'darwin') {
+        if (process.platform === 'darwin') {
             // include the current version in the URL we hit. Electron doesn't add
             // it anywhere (apart from the User-Agent) so it's up to us. We could
             // (and previously did) just use the User-Agent, but this doesn't
@@ -86,16 +124,15 @@ function startAutoUpdate(update_base_url) {
             // and also acts as a convenient cache-buster to ensure that when the
             // app updates it always gets a fresh value to avoid update-looping.
             electron.autoUpdater.setFeedURL(
-                update_base_url +
-                'macos/?localVersion=' + encodeURIComponent(electron.app.getVersion())
-            );
-        } else if (process.platform == 'win32') {
-            electron.autoUpdater.setFeedURL(update_base_url + 'win32/' + process.arch + '/');
+                `${updateBaseUrl}macos/?localVersion=${encodeURIComponent(electron.app.getVersion())}`);
+
+        } else if (process.platform === 'win32') {
+            electron.autoUpdater.setFeedURL(`${updateBaseUrl}win32/${process.arch}/`);
         } else {
             // Squirrel / electron only supports auto-update on these two platforms.
             // I'm not even going to try to guess which feed style they'd use if they
             // implemented it on Linux, or if it would be different again.
-            console.log("Auto update not supported on this platform");
+            console.log('Auto update not supported on this platform');
         }
         // We check for updates ourselves rather than using 'updater' because we need to
         // do it in the main process (and we don't really need to check every 10 minutes:
@@ -108,7 +145,7 @@ function startAutoUpdate(update_base_url) {
         setInterval(pollForUpdates, UPDATE_POLL_INTERVAL_MS);
     } catch (err) {
         // will fail if running in debug mode
-        console.log("Couldn't enable update checking", err);
+        console.log('Couldn\'t enable update checking', err);
     }
 }
 
@@ -119,7 +156,7 @@ function startAutoUpdate(update_base_url) {
 // Assuming we generally run from the console when developing,
 // this is far preferable.
 process.on('uncaughtException', function(error) {
-    console.log("Unhandled exception", error);
+    console.log('Unhandled exception', error);
 });
 
 electron.ipcMain.on('install_update', installUpdate);
@@ -143,6 +180,24 @@ electron.ipcMain.on('setBadgeCount', function(ev, count) {
     }
 });
 
+let powerSaveBlockerId;
+electron.ipcMain.on('app_onAction', function(ev, payload) {
+    switch (payload.action) {
+        case 'call_state':
+            if (powerSaveBlockerId && powerSaveBlockerId.isStarted(powerSaveBlockerId)) {
+                if (payload.state === 'ended') {
+                    electron.powerSaveBlocker.stop(powerSaveBlockerId);
+                }
+            } else {
+                if (payload.state === 'connected') {
+                    powerSaveBlockerId = electron.powerSaveBlocker.start('prevent-display-sleep');
+                }
+            }
+            break;
+    }
+});
+
+
 electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
 
 const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirectory) => {
@@ -155,30 +210,28 @@ const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirector
 });
 
 if (shouldQuit) {
-    console.log("Other instance detected: exiting");
+    console.log('Other instance detected: exiting');
     electron.app.exit();
 }
 
 electron.app.on('ready', () => {
     if (vectorConfig.update_base_url) {
-        console.log("Starting auto update with base URL: " + vectorConfig.update_base_url);
+        console.log(`Starting auto update with base URL: ${vectorConfig.update_base_url}`);
         startAutoUpdate(vectorConfig.update_base_url);
     } else {
-        console.log("No update_base_url is defined: auto update is disabled");
+        console.log('No update_base_url is defined: auto update is disabled');
     }
 
-    const icon_path = `${__dirname}/../img/riot.` + (
-        process.platform == 'win32' ? 'ico' : 'png'
-    );
+    const iconPath = `${__dirname}/../img/riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
 
     // Load the previous window state with fallback to defaults
-    let mainWindowState = windowStateKeeper({
+    const mainWindowState = windowStateKeeper({
         defaultWidth: 1024,
         defaultHeight: 768,
     });
 
     mainWindow = new electron.BrowserWindow({
-        icon: icon_path,
+        icon: iconPath,
         show: false,
         autoHideMenuBar: true,
 
@@ -188,12 +241,12 @@ electron.app.on('ready', () => {
         height: mainWindowState.height,
     });
     mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
-    electron.Menu.setApplicationMenu(VectorMenu);
+    electron.Menu.setApplicationMenu(vectorMenu);
 
     // Create trayIcon icon
     tray.create(mainWindow, {
-        icon_path: icon_path,
-        brand: vectorConfig.brand || 'Riot'
+        icon_path: iconPath,
+        brand: vectorConfig.brand || 'Riot',
     });
 
     if (!argv.hidden) {
@@ -206,7 +259,7 @@ electron.app.on('ready', () => {
         mainWindow = null;
     });
     mainWindow.on('close', (e) => {
-        if (!appQuitting && (tray.hasTray() || process.platform == 'darwin')) {
+        if (!appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
             // On Mac, closing the window just hides it
             // (this is generally how single-window Mac apps
             // behave, eg. Mail.app)

electron_app/src/squirrelhooks.js

@@ -16,30 +16,30 @@ limitations under the License.
 
 const path = require('path');
 const spawn = require('child_process').spawn;
-const app = require('electron').app;
+const {app} = require('electron');
 
-function run_update_exe(args, done) {
+function runUpdateExe(args, done) {
     // Invokes Squirrel's Update.exe which will do things for us like create shortcuts
     // Note that there's an Update.exe in the app-x.x.x directory and one in the parent
     // directory: we need to run the one in the parent directory, because it discovers
     // information about the app by inspecting the directory it's run from.
     const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');
-    console.log('Spawning `%s` with args `%s`', updateExe, args);
+    console.log(`Spawning '${updateExe}' with args '${args}'`);
     spawn(updateExe, args, {
-      detached: true
+      detached: true,
     }).on('close', done);
-};
+}
 
-function check_squirrel_hooks() {
-    if (process.platform != 'win32') return false;
+function checkSquirrelHooks() {
+    if (process.platform !== 'win32') return false;
 
     const cmd = process.argv[1];
     const target = path.basename(process.execPath);
     if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
-        run_update_exe(['--createShortcut=' + target + ''], app.quit);
+        runUpdateExe(['--createShortcut=' + target + ''], app.quit);
         return true;
     } else if (cmd === '--squirrel-uninstall') {
-        run_update_exe(['--removeShortcut=' + target + ''], app.quit);
+        runUpdateExe(['--removeShortcut=' + target + ''], app.quit);
         return true;
     } else if (cmd === '--squirrel-obsolete') {
         app.quit();
@@ -48,4 +48,4 @@ function check_squirrel_hooks() {
     return false;
 }
 
-module.exports = check_squirrel_hooks;
+module.exports = checkSquirrelHooks;

electron_app/src/tray.js

@@ -25,9 +25,7 @@ exports.hasTray = function hasTray() {
 
 exports.create = function(win, config) {
     // no trays on darwin
-    if (process.platform === 'darwin' || trayIcon) {
-        return;
-    }
+    if (process.platform === 'darwin' || trayIcon) return;
 
     const toggleWin = function() {
         if (win.isVisible() && !win.isMinimized()) {
@@ -41,12 +39,10 @@ exports.create = function(win, config) {
 
     const contextMenu = Menu.buildFromTemplate([
         {
-            label: 'Show/Hide ' + config.brand,
+            label: `Show/Hide ${config.brand}`,
             click: toggleWin,
         },
-        {
-            type: 'separator',
-        },
+        { type: 'separator' },
         {
             label: 'Quit',
             click: function() {

electron_app/src/vectormenu.js

@@ -14,170 +14,112 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const electron = require('electron');
+const {app, shell, Menu} = require('electron');
 
 // Menu template from http://electron.atom.io/docs/api/menu/, edited
 const template = [
     {
         label: 'Edit',
         submenu: [
-            {
-                role: 'undo'
-            },
-            {
-                role: 'redo'
-            },
-            {
-                type: 'separator'
-            },
-            {
-                role: 'cut'
-            },
-            {
-                role: 'copy'
-            },
-            {
-                role: 'paste'
-            },
-            {
-                role: 'pasteandmatchstyle'
-            },
-            {
-                role: 'delete'
-            },
-            {
-                role: 'selectall'
-            }
-        ]
+            { role: 'undo' },
+            { role: 'redo' },
+            { type: 'separator' },
+            { role: 'cut' },
+            { role: 'copy' },
+            { role: 'paste' },
+            { role: 'pasteandmatchstyle' },
+            { role: 'delete' },
+            { role: 'selectall' },
+        ],
     },
     {
         label: 'View',
         submenu: [
-            {
-                type: 'separator'
-            },
-            {
-                role: 'resetzoom'
-            },
-            {
-                role: 'zoomin'
-            },
-            {
-                role: 'zoomout'
-            },
-            {
-                type: 'separator'
-            },
-            {
-                role: 'togglefullscreen'
-            },
-            {
-                role: 'toggledevtools'
-            }
-        ]
+            { type: 'separator' },
+            { role: 'resetzoom' },
+            { role: 'zoomin' },
+            { role: 'zoomout' },
+            { type: 'separator' },
+            { role: 'togglefullscreen' },
+            { role: 'toggledevtools' },
+        ],
     },
     {
         role: 'window',
         submenu: [
-            {
-                role: 'minimize'
-            },
-            {
-                role: 'close'
-            }
-        ]
+            { role: 'minimize' },
+            { role: 'close' },
+        ],
     },
     {
         role: 'help',
         submenu: [
             {
                 label: 'riot.im',
-                click () { electron.shell.openExternal('https://riot.im/') }
-            }
-        ]
-    }
+                click() { shell.openExternal('https://riot.im/'); },
+            },
+        ],
+    },
 ];
 
 // macOS has specific menu conventions...
 if (process.platform === 'darwin') {
     // first macOS menu is the name of the app
-    const name = electron.app.getName()
+    const name = app.getName();
     template.unshift({
         label: name,
         submenu: [
-            {
-                role: 'about'
-            },
-            {
-                type: 'separator'
-            },
+            { role: 'about' },
+            { type: 'separator' },
             {
                 role: 'services',
-                submenu: []
+                submenu: [],
             },
-            {
-                type: 'separator'
-            },
-            {
-                role: 'hide'
-            },
-            {
-                role: 'hideothers'
-            },
-            {
-                role: 'unhide'
-            },
-            {
-                type: 'separator'
-            },
-            {
-                role: 'quit'
-            }
-        ]
-    })
+            { type: 'separator' },
+            { role: 'hide' },
+            { role: 'hideothers' },
+            { role: 'unhide' },
+            { type: 'separator' },
+            { role: 'quit' },
+        ],
+    });
     // Edit menu.
     // This has a 'speech' section on macOS
     template[1].submenu.push(
-        {
-            type: 'separator'
-        },
+        { type: 'separator' },
         {
             label: 'Speech',
             submenu: [
-                {
-                    role: 'startspeaking'
-                },
-                {
-                    role: 'stopspeaking'
-                }
-            ]
-        }
-    )
+                { role: 'startspeaking' },
+                { role: 'stopspeaking' },
+            ],
+        });
+
     // Window menu.
     // This also has specific functionality on macOS
     template[3].submenu = [
         {
             label: 'Close',
             accelerator: 'CmdOrCtrl+W',
-            role: 'close'
+            role: 'close',
         },
         {
             label: 'Minimize',
             accelerator: 'CmdOrCtrl+M',
-            role: 'minimize'
+            role: 'minimize',
         },
         {
             label: 'Zoom',
-            role: 'zoom'
+            role: 'zoom',
         },
         {
-            type: 'separator'
+            type: 'separator',
         },
         {
             label: 'Bring All to Front',
-            role: 'front'
-        }
-    ]
+            role: 'front',
+        },
+    ];
 } else {
     template.unshift({
         label: 'File',
@@ -186,12 +128,10 @@ if (process.platform === 'darwin') {
             /*{
                 role: 'about'
             },*/
-            {
-                role: 'quit'
-            }
-        ]
+            { role: 'quit' },
+        ],
     });
 }
 
-module.exports = electron.Menu.buildFromTemplate(template)
+module.exports = Menu.buildFromTemplate(template);
 

karma.conf.js

@@ -47,7 +47,6 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
 webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';
 
 webpack_config.resolve.root = [
-    path.resolve('./src'),
     path.resolve('./test'),
 ];
 

package.json

@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.8",
-    "matrix-react-sdk": "0.8.9",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",
@@ -104,6 +104,7 @@
     "emojione": "^2.2.7",
     "eslint": "^3.14.0",
     "eslint-config-google": "^0.7.1",
+    "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-react": "^6.9.0",
     "expect": "^1.16.0",

scripts/copy-res.js

@@ -3,6 +3,23 @@
 // copies the resources into the webapp directory.
 //
 
+// Languages are listed manually so we can choose when to include
+// a translation in the app (because having a translation with only
+// 3 strings translated is just frustrating)
+// This could readily be automated, but it's nice to explicitly
+// control when we languages are available.
+const INCLUDE_LANGS = [
+    //'be' Omitted because no translations in react-sdk
+    'en_EN',
+    'da',
+    'de_DE',
+    'fr',
+    'be',
+    'pt',
+    'pt_BR',
+    'ru',
+];
+
 // cpx includes globbed parts of the filename in the destination, but excludes
 // common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
 // "dest/b/...".
@@ -13,12 +30,20 @@ const COPY_LIST = [
     ["src/skins/vector/{fonts,img}/**", "webapp"],
     ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
     ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
-    ["./config.json", "webapp", {directwatch: 1}],
+    ["./config.json", "webapp", { directwatch: 1 }],
 ];
 
+INCLUDE_LANGS.forEach(function(l) {
+    COPY_LIST.push([
+        l, "webapp/i18n/", { lang: 1 },
+    ]);
+});
+
 const parseArgs = require('minimist');
 const Cpx = require('cpx');
 const chokidar = require('chokidar');
+const fs = require('fs');
+const rimraf = require('rimraf');
 
 const argv = parseArgs(
     process.argv.slice(2), {}
@@ -34,6 +59,15 @@ function errCheck(err) {
     }
 }
 
+// Check if webapp exists
+if (!fs.existsSync('webapp')) {
+    fs.mkdirSync('webapp');
+}
+// Check if i18n exists
+if (!fs.existsSync('webapp/i18n/')) {
+    fs.mkdirSync('webapp/i18n/');
+}
+
 function next(i, err) {
     errCheck(err);
 
@@ -45,10 +79,13 @@ function next(i, err) {
     const source = ent[0];
     const dest = ent[1];
     const opts = ent[2] || {};
+    let cpx = undefined;
 
-    const cpx = new Cpx.Cpx(source, dest);
+    if (!opts.lang) {
+        cpx = new Cpx.Cpx(source, dest);
+    }
 
-    if (verbose) {
+    if (verbose && cpx) {
         cpx.on("copy", (event) => {
             console.log(`Copied: ${event.srcPath} --> ${event.dstPath}`);
         });
@@ -57,7 +94,7 @@ function next(i, err) {
         });
     }
 
-    const cb = (err) => {next(i+1, err)};
+    const cb = (err) => { next(i + 1, err) };
 
     if (watch) {
         if (opts.directwatch) {
@@ -65,20 +102,74 @@ function next(i, err) {
             // which in the case of config.json is '.', which inevitably takes
             // ages to crawl. So we create our own watcher on the files
             // instead.
-            const copy = () => {cpx.copy(errCheck)};
+            const copy = () => { cpx.copy(errCheck) };
             chokidar.watch(source)
                 .on('add', copy)
                 .on('change', copy)
                 .on('ready', cb)
                 .on('error', errCheck);
+        } else if (opts.lang) {
+            const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + source + '.json';
+            const riotWebFile = 'src/i18n/strings/' + source + '.json';
+
+            const translations = {};
+            const makeLang = () => { genLangFile(source, dest) };
+            [reactSdkFile, riotWebFile].forEach(function(f) {
+                chokidar.watch(f)
+                    .on('add', makeLang)
+                    .on('change', makeLang)
+                    //.on('ready', cb)  We'd have to do this when both files are ready
+                    .on('error', errCheck);
+            });
+            next(i + 1, err);
         } else {
             cpx.on('watch-ready', cb);
             cpx.on("watch-error", cb);
             cpx.watch();
         }
+    } else if (opts.lang) {
+        genLangFile(source, dest);
+        next(i + 1, err);
     } else {
         cpx.copy(cb);
     }
 }
 
+function genLangFile(lang, dest) {
+    const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
+    const riotWebFile = 'src/i18n/strings/' + lang + '.json';
+
+    const translations = {};
+    [reactSdkFile, riotWebFile].forEach(function(f) {
+        if (fs.existsSync(f)) {
+            Object.assign(
+                translations,
+                JSON.parse(fs.readFileSync(f).toString())
+            );
+        }
+    });
+    fs.writeFileSync(dest + lang + '.json', JSON.stringify(translations, null, 4));
+    if (verbose) {
+        console.log("Generated language file: " + lang);
+    }
+}
+
+function genLangList() {
+    const languages = {};
+    INCLUDE_LANGS.forEach(function(lang) {
+        const normalizedLanguage = lang.toLowerCase().replace("_", "-");
+        const languageParts = normalizedLanguage.split('-');
+        if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
+            languages[languageParts[0]] = lang + '.json';
+        } else {
+            languages[normalizedLanguage] = lang + '.json';
+        }
+    });
+    fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4));
+    if (verbose) {
+        console.log("Generated language list");
+    }
+}
+
+genLangList();
 next(0);

scripts/fetch-develop.deps.sh

@@ -40,11 +40,13 @@ dodep matrix-org matrix-react-sdk
 mkdir -p node_modules
 cd node_modules
 
+rm -r matrix-js-sdk 2> /dev/null
 ln -s ../matrix-js-sdk ./
 pushd matrix-js-sdk
 npm install
 popd
 
+rm -r matrix-react-sdk 2> /dev/null
 ln -s ../matrix-react-sdk ./
 pushd matrix-react-sdk
 mkdir -p node_modules

scripts/jenkins.sh

@@ -34,11 +34,9 @@ npm run lintall -- -f checkstyle -o eslint.xml || true
 
 rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
 
- # node_modules deps from 'npm install' don't have a .git dir so can't
- # rev-parse; but they do set the commit in package.json under 'gitHead' which
- # we're grabbing here.
-REACT_SHA=$(grep 'gitHead' node_modules/matrix-react-sdk/package.json | cut -d \" -f 4 | head -c 12)
-JSSDK_SHA=$(grep 'gitHead' node_modules/matrix-js-sdk/package.json | cut -d \" -f 4 | head -c 12)
+# Since the deps are fetched from git, we can rev-parse
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
 
 VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
 

src/components/structures/BottomLeftMenu.js

@@ -18,7 +18,8 @@ limitations under the License.
 
 var React = require('react');
 var ReactDOM = require('react-dom');
-var sdk = require('matrix-react-sdk')
+var sdk = require('matrix-react-sdk');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
 
@@ -120,7 +121,7 @@ module.exports = React.createClass({
             homeButton = (
                 <AccessibleButton className="mx_BottomLeftMenu_homePage" onClick={ this.onHomeClick } onMouseEnter={ this.onHomeMouseEnter } onMouseLeave={ this.onHomeMouseLeave } >
                     <TintableSvg src="img/icons-home.svg" width="25" height="25" />
-                    { this.getLabel("Welcome page", this.state.homeHover) }
+                    { this.getLabel(_t("Welcome page"), this.state.homeHover) }
                 </AccessibleButton>
             );
         }
@@ -131,19 +132,19 @@ module.exports = React.createClass({
                     { homeButton }
                     <AccessibleButton className="mx_BottomLeftMenu_people" onClick={ this.onPeopleClick } onMouseEnter={ this.onPeopleMouseEnter } onMouseLeave={ this.onPeopleMouseLeave } >
                         <TintableSvg src="img/icons-people.svg" width="25" height="25" />
-                        { this.getLabel("Start chat", this.state.peopleHover) }
+                        { this.getLabel(_t("Start chat"), this.state.peopleHover) }
                     </AccessibleButton>
                     <AccessibleButton className="mx_BottomLeftMenu_directory" onClick={ this.onDirectoryClick } onMouseEnter={ this.onDirectoryMouseEnter } onMouseLeave={ this.onDirectoryMouseLeave } >
                         <TintableSvg src="img/icons-directory.svg" width="25" height="25"/>
-                        { this.getLabel("Room directory", this.state.directoryHover) }
+                        { this.getLabel(_t("Room directory"), this.state.directoryHover) }
                     </AccessibleButton>
                     <AccessibleButton className="mx_BottomLeftMenu_createRoom" onClick={ this.onRoomsClick } onMouseEnter={ this.onRoomsMouseEnter } onMouseLeave={ this.onRoomsMouseLeave } >
                         <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
-                        { this.getLabel("Create new room", this.state.roomsHover) }
+                        { this.getLabel(_t("Create new room"), this.state.roomsHover) }
                     </AccessibleButton>
                     <AccessibleButton className="mx_BottomLeftMenu_settings" onClick={ this.onSettingsClick } onMouseEnter={ this.onSettingsMouseEnter } onMouseLeave={ this.onSettingsMouseLeave } >
                         <TintableSvg src="img/icons-settings.svg" width="25" height="25" />
-                        { this.getLabel("Settings", this.state.settingsHover) }
+                        { this.getLabel(_t("Settings"), this.state.settingsHover) }
                     </AccessibleButton>
                 </div>
             </div>

src/components/structures/RightPanel.js

@@ -16,14 +16,15 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sdk = require('matrix-react-sdk');
-var Matrix = require("matrix-js-sdk");
-var dis = require('matrix-react-sdk/lib/dispatcher');
-var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
-var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
-var Modal = require('matrix-react-sdk/lib/Modal');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
+import React from 'react';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import sdk from 'matrix-react-sdk';
+import Matrix from "matrix-js-sdk";
+import dis from 'matrix-react-sdk/lib/dispatcher';
+import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
+import Modal from 'matrix-react-sdk/lib/Modal';
+import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
 
 module.exports = React.createClass({
     displayName: 'RightPanel',
@@ -34,7 +35,7 @@ module.exports = React.createClass({
         collapsed: React.PropTypes.bool, // currently unused property to request for a minimized view of the panel
     },
 
-    Phase : {
+    Phase: {
         MemberList: 'MemberList',
         FilePanel: 'FilePanel',
         NotificationPanel: 'NotificationPanel',
@@ -91,8 +92,8 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get().isGuest()) {
             var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
-                title: "Please Register",
-                description: "Guest users can't invite users. Please register to invite."
+                title: _t('Please Register'),
+                description: _t('Guest users can\'t invite users. Please register to invite') + '.'
             });
             return;
         }
@@ -188,7 +189,7 @@ module.exports = React.createClass({
                         <div className="mx_RightPanel_icon" >
                             <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
                         </div>
-                        <div className="mx_RightPanel_message">Invite to this room</div>
+                        <div className="mx_RightPanel_message">{ _t('Invite to this room') }</div>
                     </AccessibleButton>;
             }
 
@@ -198,21 +199,21 @@ module.exports = React.createClass({
             buttonGroup =
                     <div className="mx_RightPanel_headerButtonGroup">
                         <AccessibleButton className="mx_RightPanel_headerButton"
-                                title="Members" onClick={ this.onMemberListButtonClick }>
+                                title={ _t('Members') } onClick={ this.onMemberListButtonClick }>
                             <div className="mx_RightPanel_headerButton_badge">{ membersBadge ? membersBadge : <span>&nbsp;</span>}</div>
                             <TintableSvg src="img/icons-people.svg" width="25" height="25"/>
                             { membersHighlight }
                         </AccessibleButton>
                         <AccessibleButton
                                 className="mx_RightPanel_headerButton mx_RightPanel_filebutton"
-                                title="Files" onClick={ this.onFileListButtonClick }>
+                                title={ _t('Files') } onClick={ this.onFileListButtonClick }>
                             <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
                             <TintableSvg src="img/icons-files.svg" width="25" height="25"/>
                             { filesHighlight }
                         </AccessibleButton>
                         <AccessibleButton
                                 className="mx_RightPanel_headerButton mx_RightPanel_notificationbutton"
-                                title="Notifications" onClick={ this.onNotificationListButtonClick }>
+                                title={ _t('Notifications') } onClick={ this.onNotificationListButtonClick }>
                             <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
                             <TintableSvg src="img/icons-notifications.svg" width="25" height="25"/>
                             { notificationsHighlight }
@@ -220,7 +221,7 @@ module.exports = React.createClass({
                         <div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" title="Hide panel" onClick={ this.onCollapseClick }>
                             <TintableSvg src="img/minimise.svg" width="10" height="16"/>
                         </div>
-                    </div>;
+                  </div>;
         }
 
         if (!this.props.collapsed) {

src/components/structures/RoomDirectory.js

@@ -30,6 +30,8 @@ var linkifyMatrix = require('matrix-react-sdk/lib/linkify-matrix');
 var sanitizeHtml = require('sanitize-html');
 var q = require('q');
 
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
+
 import {instanceForInstanceId, protocolNameForInstanceId} from '../../utils/DirectoryUtils';
 
 linkifyMatrix(linkify);
@@ -80,8 +82,8 @@ module.exports = React.createClass({
             }
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Failed to get protocol list from Home Server",
-                description: "The Home Server may be too old to support third party networks",
+                title: _t('Failed to get protocol list from Home Server'),
+                description: _t('The Home Server may be too old to support third party networks'),
             });
         });
 
@@ -176,8 +178,8 @@ module.exports = React.createClass({
             console.error("Failed to get publicRooms: %s", JSON.stringify(err));
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Failed to get public room list",
-                description: ((err && err.message) ? err.message : "The server may be unavailable or overloaded"),
+                title: _t('Failed to get public room list'),
+                description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded'))
             });
         });
     },
@@ -191,31 +193,31 @@ module.exports = React.createClass({
      */
     removeFromDirectory: function(room) {
         var alias = get_display_alias_for_room(room);
-        var name = room.name || alias || "Unnamed room";
+        var name = room.name || alias || _t('Unnamed room');
 
         var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
         var desc;
         if (alias) {
-            desc = `Delete the room alias '${alias}' and remove '${name}' from the directory?`;
+            desc = _t('Delete the room alias %(alias)s and remove %(name)s from the directory?', {alias: alias, name: name});
         } else {
-            desc = `Remove '${name}' from the directory?`;
+            desc = _t('Remove %(name)s from the directory?', {name: name});
         }
 
         Modal.createDialog(QuestionDialog, {
-            title: "Remove from Directory",
+            title: _t('Remove from Directory'),
             description: desc,
             onFinished: (should_delete) => {
                 if (!should_delete) return;
 
                 var Loader = sdk.getComponent("elements.Spinner");
                 var modal = Modal.createDialog(Loader);
-                var step = `remove '${name}' from the directory.`;
+                var step = _t('remove %(name)s from the directory', {name: name}) + '.';
 
                 MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
                     if (!alias) return;
-                    step = 'delete the alias.';
+                    step = _t('delete the alias') + '.';
                     return MatrixClientPeg.get().deleteAlias(alias);
                 }).done(() => {
                     modal.close();
@@ -225,8 +227,8 @@ module.exports = React.createClass({
                     this.refreshRoomList();
                     console.error("Failed to " + step + ": " + err);
                     Modal.createDialog(ErrorDialog, {
-                        title: "Failed to " + step,
-                        description: ((err && err.message) ? err.message : "The server may be unavailable or overloaded"),
+                        title: _t('Error'),
+                        description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded'))
                     });
                 });
             }
@@ -314,8 +316,8 @@ module.exports = React.createClass({
             if (!fields) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Unable to join network",
-                    description: "Riot does not know how to join a room on this network",
+                    title: _t('Unable to join network'),
+                    description: _t('Riot does not know how to join a room on this network'),
                 });
                 return;
             }
@@ -325,15 +327,15 @@ module.exports = React.createClass({
                 } else {
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createDialog(ErrorDialog, {
-                        title: "Room not found",
-                        description: "Couldn't find a matching Matrix room",
+                        title: _t('Room not found'),
+                        description: _t('Couldn\'t find a matching Matrix room'),
                     });
                 }
             }, (e) => {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Fetching third party location failed",
-                    description: "Unable to look up room ID from server",
+                    title: _t('Fetching third party location failed'),
+                    description: _t('Unable to look up room ID from server'),
                 });
             });
         }
@@ -353,8 +355,8 @@ module.exports = React.createClass({
                 if (!room.world_readable && !room.guest_can_join) {
                     var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                     Modal.createDialog(NeedToRegisterDialog, {
-                        title: "Failed to join the room",
-                        description: "This room is inaccessible to guests. You may be able to join if you register."
+                        title: _t('Failed to join the room'),
+                        description: _t('This room is inaccessible to guests. You may be able to join if you register') + '.'
                     });
                     return;
                 }
@@ -368,7 +370,7 @@ module.exports = React.createClass({
                 avatarUrl: room.avatar_url,
                 // XXX: This logic is duplicated from the JS SDK which
                 // would normally decide what the name is.
-                name: room.name || room_alias || "Unnamed room",
+                name: room.name || room_alias || _t('Unnamed room'),
             };
         }
         // It's not really possible to join Matrix rooms by ID because the HS has no way to know
@@ -393,18 +395,18 @@ module.exports = React.createClass({
         var self = this;
         var guestRead, guestJoin, perms;
         for (var i = 0; i < rooms.length; i++) {
-            var name = rooms[i].name || get_display_alias_for_room(rooms[i]) || "Unnamed room";
+            var name = rooms[i].name || get_display_alias_for_room(rooms[i]) || _t('Unnamed room');
             guestRead = null;
             guestJoin = null;
 
             if (rooms[i].world_readable) {
                 guestRead = (
-                    <div className="mx_RoomDirectory_perm">World readable</div>
+                    <div className="mx_RoomDirectory_perm">{ _t('World readable') }</div>
                 );
             }
             if (rooms[i].guest_can_join) {
                 guestJoin = (
-                    <div className="mx_RoomDirectory_perm">Guests can join</div>
+                    <div className="mx_RoomDirectory_perm">{ _t('Guests can join') }</div>
                 );
             }
 
@@ -493,7 +495,7 @@ module.exports = React.createClass({
         if (this.state.protocolsLoading) {
             return (
                 <div className="mx_RoomDirectory">
-                    <SimpleRoomHeader title="Directory" />
+                    <SimpleRoomHeader title={ _t('Directory') } />
                     <Loader />
                 </div>
             );
@@ -511,7 +513,7 @@ module.exports = React.createClass({
             // request from the scrollpanel because there isn't one
             let scrollpanel_content;
             if (rows.length == 0) {
-                scrollpanel_content = <i>No rooms to show</i>;
+                scrollpanel_content = <i>{ _t('No rooms to show') }</i>;
             } else {
                 scrollpanel_content = <table ref="directory_table" className="mx_RoomDirectory_table">
                     <tbody>
@@ -545,9 +547,9 @@ module.exports = React.createClass({
         }
 
 
-        let placeholder = 'Search for a room';
+        let placeholder = _t('Search for a room');
         if (!this.state.instanceId) {
-            placeholder = '#example:' + this.state.roomServer;
+            placeholder = _t('#example') + ':' + this.state.roomServer;
         } else if (instance_expected_field_type) {
             placeholder = instance_expected_field_type.placeholder;
         }
@@ -564,7 +566,7 @@ module.exports = React.createClass({
         const DirectorySearchBox = sdk.getComponent('elements.DirectorySearchBox');
         return (
             <div className="mx_RoomDirectory">
-                <SimpleRoomHeader title="Directory" icon="img/icons-directory.svg"/>
+                <SimpleRoomHeader title={ _t('Directory') } icon="img/icons-directory.svg" />
                 <div className="mx_RoomDirectory_list">
                     <div className="mx_RoomDirectory_listheader">
                         <DirectorySearchBox

src/components/structures/RoomSubList.js

@@ -20,7 +20,8 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var classNames = require('classnames');
 var DropTarget = require('react-dnd').DropTarget;
-var sdk = require('matrix-react-sdk')
+var sdk = require('matrix-react-sdk');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var Unread = require('matrix-react-sdk/lib/Unread');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
@@ -463,7 +464,7 @@ var RoomSubList = React.createClass({
         return (
             <AccessibleButton className="mx_RoomSubList_ellipsis" onClick={this._showFullMemberList}>
                 <div className="mx_RoomSubList_line"></div>
-                <div className="mx_RoomSubList_more">more</div>
+                <div className="mx_RoomSubList_more">{ _t("more") }</div>
                 <div className={ badgeClasses }>{ content }</div>
             </AccessibleButton>
         );
@@ -509,8 +510,8 @@ var RoomSubList = React.createClass({
                         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         console.error("Failed to add tag " + self.props.tagName + " to room" + err);
                         Modal.createDialog(ErrorDialog, {
-                            title: "Failed to add tag " + self.props.tagName + " to room",
-                            description: ((err && err.message) ? err.message : "Operation failed"),
+                            title: _t('Failed to add tag %(tagName)s to room', {tagName: self.props.tagName}),
+                            description: ((err && err.message) ? err.message : _t('Operation failed')),
                         });
                     });
                     break;
@@ -530,7 +531,7 @@ var RoomSubList = React.createClass({
 
         var target;
         if (this.state.sortedList.length == 0 && this.props.editable) {
-            target = <RoomDropTarget label={ 'Drop here to ' + this.props.verb }/>;
+            target = <RoomDropTarget label={ _t("Drop here %(toAction)s", {toAction: this.props.verb}) }/>;
         }
 
         if (this.state.sortedList.length > 0 || this.props.editable) {

src/components/structures/SearchBox.js

@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 var sdk = require('matrix-react-sdk')
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
@@ -134,7 +135,7 @@ module.exports = React.createClass({
                         className="mx_SearchBox_search"
                         value={ this.state.searchTerm }
                         onChange={ this.onChange }
-                        placeholder="Filter room names"
+                        placeholder={ _t('Filter room names') }
                     />
                 ];
         }

src/components/views/context_menus/MessageContextMenu.js

@@ -16,13 +16,14 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var dis = require('matrix-react-sdk/lib/dispatcher');
-var sdk = require('matrix-react-sdk');
-var Modal = require('matrix-react-sdk/lib/Modal');
-var Resend = require("matrix-react-sdk/lib/Resend");
+const MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
+const dis = require('matrix-react-sdk/lib/dispatcher');
+const sdk = require('matrix-react-sdk');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
+const Modal = require('matrix-react-sdk/lib/Modal');
+const Resend = require("matrix-react-sdk/lib/Resend");
 import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
 
 module.exports = React.createClass({
@@ -39,13 +40,38 @@ module.exports = React.createClass({
         onFinished: React.PropTypes.func,
     },
 
+    getInitialState: function() {
+        return {
+            canRedact: false,
+        };
+    },
+
+    componentWillMount: function() {
+        MatrixClientPeg.get().on('RoomMember.powerLevel', this._checkCanRedact);
+        this._checkCanRedact();
+    },
+
+    componentWillUnmount: function() {
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener('RoomMember.powerLevel', this._checkCanRedact);
+        }
+    },
+
+    _checkCanRedact: function() {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(this.props.mxEvent.getRoomId());
+        const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId);
+        this.setState({canRedact});
+    },
+
     onResendClick: function() {
         Resend.resend(this.props.mxEvent);
         if (this.props.onFinished) this.props.onFinished();
     },
 
     onViewSourceClick: function() {
-        var ViewSource = sdk.getComponent('structures.ViewSource');
+        const ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createDialog(ViewSource, {
             content: this.props.mxEvent.event,
         }, 'mx_Dialog_viewsource');
@@ -70,12 +96,12 @@ module.exports = React.createClass({
                 MatrixClientPeg.get().redactEvent(
                     this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
                 ).catch(function(e) {
-                    var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     // display error message stating you couldn't delete this.
-                    var code = e.errcode || e.statusCode;
+                    const code = e.errcode || e.statusCode;
                     Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "You cannot delete this message. (" + code + ")"
+                        title: _t('Error'),
+                        description: _t('You cannot delete this message. (%(code)s)', {code: code})
                     });
                 }).done();
             },
@@ -88,6 +114,14 @@ module.exports = React.createClass({
         if (this.props.onFinished) this.props.onFinished();
     },
 
+    onForwardClick: function() {
+        dis.dispatch({
+            action: 'forward_event',
+            content: this.props.mxEvent,
+        });
+        this.closeMenu();
+    },
+
     closeMenu: function() {
         if (this.props.onFinished) this.props.onFinished();
     },
@@ -99,7 +133,7 @@ module.exports = React.createClass({
         if (this.props.onFinished) this.props.onFinished();
     },
 
-    onQuoteClick: function () {
+    onQuoteClick: function() {
         console.log(this.props.mxEvent);
         dis.dispatch({
             action: 'quote',
@@ -108,28 +142,29 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var eventStatus = this.props.mxEvent.status;
-        var resendButton;
-        var viewSourceButton;
-        var viewClearSourceButton;
-        var redactButton;
-        var cancelButton;
-        var permalinkButton;
-        var unhidePreviewButton;
-        var externalURLButton;
+        const eventStatus = this.props.mxEvent.status;
+        let resendButton;
+        let redactButton;
+        let cancelButton;
+        let forwardButton;
+        let viewSourceButton;
+        let viewClearSourceButton;
+        let unhidePreviewButton;
+        let permalinkButton;
+        let externalURLButton;
 
         if (eventStatus === 'not_sent') {
             resendButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onResendClick}>
-                    Resend
+                    { _t('Resend') }
                 </div>
             );
         }
 
-        if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
+        if (this.state.canRedact) {
             redactButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
-                    Redact
+                    { _t('Remove') }
                 </div>
             );
         }
@@ -137,21 +172,32 @@ module.exports = React.createClass({
         if (eventStatus === "queued" || eventStatus === "not_sent") {
             cancelButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onCancelSendClick}>
-                    Cancel Sending
+                    { _t('Cancel Sending') }
                 </div>
             );
         }
 
+        if (!eventStatus && this.props.mxEvent.getType() === 'm.room.message') {
+            const content = this.props.mxEvent.getContent();
+            if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {
+                forwardButton = (
+                    <div className="mx_MessageContextMenu_field" onClick={this.onForwardClick}>
+                        Forward Message
+                    </div>
+                );
+            }
+        }
+
         viewSourceButton = (
             <div className="mx_MessageContextMenu_field" onClick={this.onViewSourceClick}>
-                View Source
+                { _t('View Source') }
             </div>
         );
 
         if (this.props.mxEvent.getType() !== this.props.mxEvent.getWireType()) {
             viewClearSourceButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onViewClearSourceClick}>
-                    View Decrypted Source
+                    { _t('View Decrypted Source') }
                 </div>
             );
         }
@@ -160,9 +206,9 @@ module.exports = React.createClass({
             if (this.props.eventTileOps.isWidgetHidden()) {
                 unhidePreviewButton = (
                     <div className="mx_MessageContextMenu_field" onClick={this.onUnhidePreviewClick}>
-                        Unhide Preview
+                        { _t('Unhide Preview') }
                     </div>
-                )
+                );
             }
         }
 
@@ -170,13 +216,13 @@ module.exports = React.createClass({
         permalinkButton = (
             <div className="mx_MessageContextMenu_field">
                 <a href={ "https://matrix.to/#/" + this.props.mxEvent.getRoomId() +"/"+ this.props.mxEvent.getId() }
-                  target="_blank" rel="noopener" onClick={ this.closeMenu }>Permalink</a>
+                  target="_blank" rel="noopener" onClick={ this.closeMenu }>{ _t('Permalink') }</a>
             </div>
         );
 
         const quoteButton = (
             <div className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
-                Quote
+                { _t('Quote') }
             </div>
         );
 
@@ -185,7 +231,7 @@ module.exports = React.createClass({
           externalURLButton = (
               <div className="mx_MessageContextMenu_field">
                   <a href={ this.props.mxEvent.event.content.external_url }
-                    rel="noopener" target="_blank"  onClick={ this.closeMenu }>Source URL</a>
+                    rel="noopener" target="_blank" onClick={ this.closeMenu }>{ _t('Source URL') }</a>
               </div>
           );
         }
@@ -196,6 +242,7 @@ module.exports = React.createClass({
                 {resendButton}
                 {redactButton}
                 {cancelButton}
+                {forwardButton}
                 {viewSourceButton}
                 {viewClearSourceButton}
                 {unhidePreviewButton}
@@ -204,5 +251,5 @@ module.exports = React.createClass({
                 {externalURLButton}
             </div>
         );
-    }
+    },
 });

src/components/views/context_menus/RoomTileContextMenu.js

@@ -21,6 +21,7 @@ import q from 'q';
 import React from 'react';
 import classNames from 'classnames';
 import sdk from 'matrix-react-sdk';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import dis from 'matrix-react-sdk/lib/dispatcher';
 import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
@@ -70,8 +71,8 @@ module.exports = React.createClass({
                     }).fail(function(err) {
                         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         Modal.createDialog(ErrorDialog, {
-                            title: "Failed to remove tag " + tagNameOff + " from room",
-                            description: ((err && err.message) ? err.message : "Operation failed"),
+                            title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOff}),
+                            description: ((err && err.message) ? err.message : _t('Operation failed')),
                         });
                     });
                 }
@@ -87,8 +88,8 @@ module.exports = React.createClass({
                     }).fail(function(err) {
                         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         Modal.createDialog(ErrorDialog, {
-                            title: "Failed to add tag " + tagNameOn + " to room",
-                            description: ((err && err.message) ? err.message : "Operation failed"),
+                            title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOn}),
+                            description: ((err && err.message) ? err.message : _t('Operation failed')),
                         });
                     });
                 }
@@ -148,8 +149,8 @@ module.exports = React.createClass({
         }, (err) => {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Failed to set Direct Message status of room",
-                description: ((err && err.message) ? err.message : "Operation failed"),
+                title: _t('Failed to set Direct Message status of room'),
+                description: ((err && err.message) ? err.message : _t('Operation failed')),
             });
         });
     },
@@ -187,8 +188,8 @@ module.exports = React.createClass({
             var errCode = err.errcode || "unknown error code";
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: `Failed to forget room (${errCode})`,
-                description: ((err && err.message) ? err.message : "Operation failed"),
+                title: _t('Failed to forget room %(errCode)s', {errCode: errCode}),
+                description: ((err && err.message) ? err.message : _t('Operation failed')),
             });
         });
 
@@ -274,22 +275,22 @@ module.exports = React.createClass({
                 <div className={ alertMeClasses } onClick={this._onClickAlertMe} >
                     <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
                     <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute-off-copy.svg" width="16" height="12" />
-                    All messages (loud)
+                    { _t('All messages (loud)') }
                 </div>
                 <div className={ allNotifsClasses } onClick={this._onClickAllNotifs} >
                     <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
                     <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute-off.svg" width="16" height="12" />
-                    All messages
+                    { _t('All messages') }
                 </div>
                 <div className={ mentionsClasses } onClick={this._onClickMentions} >
                     <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
                     <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute-mentions.svg" width="16" height="12" />
-                    Mentions only
+                    { _t('Mentions only') }
                 </div>
                 <div className={ muteNotifsClasses } onClick={this._onClickMute} >
                     <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
                     <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute.svg" width="16" height="12" />
-                    Mute
+                    { _t('Mute') }
                 </div>
             </div>
         );
@@ -306,16 +307,16 @@ module.exports = React.createClass({
         switch (membership) {
             case "join":
                 leaveClickHandler = this._onClickLeave;
-                leaveText = "Leave";
+                leaveText = _t('Leave');
                 break;
             case "leave":
             case "ban":
                 leaveClickHandler = this._onClickForget;
-                leaveText = "Forget";
+                leaveText = _t('Forget');
                 break;
             case "invite":
                 leaveClickHandler = this._onClickReject;
-                leaveText = "Reject";
+                leaveText = _t('Reject');
                 break;
         }
 
@@ -353,17 +354,17 @@ module.exports = React.createClass({
                 <div className={ favouriteClasses } onClick={this._onClickFavourite} >
                     <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_fave.svg" width="15" height="15" />
                     <img className="mx_RoomTileContextMenu_tag_icon_set" src="img/icon_context_fave_on.svg" width="15" height="15" />
-                    Favourite
+                    { _t('Favourite') }
                 </div>
                 <div className={ lowPriorityClasses } onClick={this._onClickLowPriority} >
                     <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_low.svg" width="15" height="15" />
                     <img className="mx_RoomTileContextMenu_tag_icon_set" src="img/icon_context_low_on.svg" width="15" height="15" />
-                    Low Priority
+                    { _t('Low Priority') }
                 </div>
                 <div className={ dmClasses } onClick={this._onClickDM} >
                     <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_person.svg" width="15" height="15" />
                     <img className="mx_RoomTileContextMenu_tag_icon_set" src="img/icon_context_person_on.svg" width="15" height="15" />
-                    Direct Chat
+                    { _t('Direct Chat') }
                 </div>
             </div>
         );

src/components/views/elements/ImageView.js

@@ -25,6 +25,7 @@ var filesize = require('filesize');
 var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
 const Modal = require('matrix-react-sdk/lib/Modal');
 const sdk = require('matrix-react-sdk');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 module.exports = React.createClass({
     displayName: 'ImageView',
@@ -76,8 +77,8 @@ module.exports = React.createClass({
                     // display error message stating you couldn't delete this.
                     var code = e.errcode || e.statusCode;
                     Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "You cannot delete this image. (" + code + ")"
+                        title: _t('Error'),
+                        description: _t('You cannot delete this image. (%(code)s)', {code: code})
                     });
                 }).done();
             }
@@ -150,14 +151,14 @@ module.exports = React.createClass({
         var eventMeta;
         if(showEventMeta) {
             eventMeta = (<div className="mx_ImageView_metadata">
-                Uploaded on { DateUtils.formatDate(new Date(this.props.mxEvent.getTs())) } by { this.props.mxEvent.getSender() }
+                { _t('Uploaded on %(date)s by %(user)s', {date: DateUtils.formatDate(new Date(this.props.mxEvent.getTs())), user: this.props.mxEvent.getSender()}) }
             </div>);
         }
 
         var eventRedact;
         if(showEventMeta) {
             eventRedact = (<div className="mx_ImageView_button" onClick={this.onRedactClick}>
-                Redact
+                { _t('Redact') }
             </div>);
         }
 
@@ -169,7 +170,7 @@ module.exports = React.createClass({
                     <img src={this.props.src} style={style}/>
                     <div className="mx_ImageView_labelWrapper">
                         <div className="mx_ImageView_label">
-                            <AccessibleButton className="mx_ImageView_cancel" onClick={ this.props.onFinished }><img src="img/cancel-white.svg" width="18" height="18" alt="Close"/></AccessibleButton>
+                            <AccessibleButton className="mx_ImageView_cancel" onClick={ this.props.onFinished }><img src="img/cancel-white.svg" width="18" height="18" alt={ _t('Close') }/></AccessibleButton>
                             <div className="mx_ImageView_shim">
                             </div>
                             <div className="mx_ImageView_name">
@@ -178,7 +179,7 @@ module.exports = React.createClass({
                             { eventMeta }
                             <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } target="_blank" rel="noopener">
                                 <div className="mx_ImageView_download">
-                                        Download this file<br/>
+                                        { _t('Download this file') }<br/>
                                          <span className="mx_ImageView_size">{ size_res }</span>
                                 </div>
                             </a>

src/components/views/globals/MatrixToolbar.js

@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 var Notifier = require("matrix-react-sdk/lib/Notifier");
 var sdk = require('matrix-react-sdk')
 var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
@@ -37,7 +38,7 @@ module.exports = React.createClass({
             <div className="mx_MatrixToolbar">
                 <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
                 <div className="mx_MatrixToolbar_content">
-                    You are not receiving desktop notifications. <a className="mx_MatrixToolbar_link" onClick={ this.onClick }>Enable them now</a>
+                   { _t('You are not receiving desktop notifications') } <a className="mx_MatrixToolbar_link" onClick={ this.onClick }> { _t('Enable them now') }</a>
                 </div>
                 <AccessibleButton className="mx_MatrixToolbar_close" onClick={ this.hideToolbar } ><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
             </div>

src/components/views/login/VectorCustomServerDialog.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 var React = require("react");
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 module.exports = React.createClass({
     displayName: 'VectorCustomServerDialog',
@@ -26,24 +27,14 @@ module.exports = React.createClass({
         return (
             <div className="mx_ErrorDialog">
                 <div className="mx_Dialog_title">
-                    Custom Server Options
+                    { _t('Custom Server Options') }
                 </div>
                 <div className="mx_Dialog_content">
-                    <span>
-                        You can use the custom server options to sign into other Matrix
-                        servers by specifying a different Home server URL.
-                        <br/>
-                        This allows you to use Riot with an existing Matrix account on
-                        a different home server.
-                        <br/>
-                        <br/>
-                        You can also set a custom identity server but you won't be able to
-                        invite users by email address, or be invited by email address yourself.
-                    </span>
+                    <span dangerouslySetInnerHTML={{__html: _t('customServer_text')}} />
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.props.onFinished} autoFocus={true}>
-                        Dismiss
+                        { _t('Dismiss') }
                     </button>
                 </div>
             </div>

src/components/views/login/VectorLoginFooter.js

@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 module.exports = React.createClass({
     displayName: 'VectorLoginFooter',
@@ -30,7 +31,7 @@ module.exports = React.createClass({
                 <a href="https://medium.com/@RiotChat">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://twitter.com/@RiotChat">twitter</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://github.com/vector-im/vector-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-                <a href="https://matrix.org">powered by Matrix</a>
+                <a href="https://matrix.org">{ _t('powered by Matrix') }</a>
             </div>
         );
     }

src/components/views/messages/DateSeparator.js

@@ -14,19 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
+import React from 'react';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import DateUtils from 'matrix-react-sdk/lib/DateUtils';
 
-var React = require('react');
-
-var days = [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-];
+function getdaysArray() {
+	return [
+        _t('Sunday'),
+        _t('Monday'),
+        _t('Tuesday'),
+        _t('Wednesday'),
+        _t('Thursday'),
+        _t('Friday'),
+        _t('Saturday'),
+    ];
+}
 
 module.exports = React.createClass({
     displayName: 'DateSeparator',
@@ -34,19 +36,20 @@ module.exports = React.createClass({
         var date = new Date(this.props.ts);
         var today = new Date();
         var yesterday = new Date();
+        var days = getdaysArray();
         yesterday.setDate(today.getDate() - 1);
         var label;
         if (date.toDateString() === today.toDateString()) {
-            label = "Today";
+            label = _t('Today');
         }
         else if (date.toDateString() === yesterday.toDateString()) {
-            label = "Yesterday";
+            label = _t('Yesterday');
         }
         else if (today.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
             label = days[date.getDay()];
         }
         else {
-            label = date.toDateString();
+            label = DateUtils.formatFullDate(date);
         }
 
         return (

src/components/views/messages/MessageTimestamp.js

@@ -16,19 +16,23 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var DateUtils = require('matrix-react-sdk/lib/DateUtils');
+import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
+const React = require('react');
+const DateUtils = require('matrix-react-sdk/lib/DateUtils');
 
 module.exports = React.createClass({
     displayName: 'MessageTimestamp',
 
+    propTypes: {
+        showTwelveHour: React.PropTypes.bool,
+    },
+
     render: function() {
-        var date = new Date(this.props.ts);
+        const date = new Date(this.props.ts);
         return (
             <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
-                { DateUtils.formatTime(date) }
+                { DateUtils.formatTime(date, this.props.showTwelveHour) }
             </span>
         );
     },
 });
-

src/components/views/rooms/DNDRoomTile.js

@@ -23,6 +23,7 @@ import {DropTarget} from 'react-dnd';
 import dis from 'matrix-react-sdk/lib/dispatcher';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import sdk from 'matrix-react-sdk';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import RoomTile from 'matrix-react-sdk/lib/components/views/rooms/RoomTile';
 import * as Rooms from 'matrix-react-sdk/lib/Rooms';
 import Modal from 'matrix-react-sdk/lib/Modal';
@@ -90,8 +91,8 @@ var roomTileSource = {
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to set direct chat tag " + err);
                     Modal.createDialog(ErrorDialog, {
-                        title: "Failed to set direct chat tag",
-                        description: ((err && err.message) ? err.message : "Operation failed"),
+                        title: _t('Failed to set direct chat tag'),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
                 });
                 return;
@@ -115,8 +116,8 @@ var roomTileSource = {
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to remove tag " + prevTag + " from room: " + err);
                     Modal.createDialog(ErrorDialog, {
-                        title: "Failed to remove tag " + prevTag + " from room",
-                        description: ((err && err.message) ? err.message : "Operation failed"),
+                        title: _t('Failed to remove tag %(tagName)s from room', {tagName: prevTag}),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
                 });
             }
@@ -137,8 +138,8 @@ var roomTileSource = {
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to add tag " + newTag + " to room: " + err);
                     Modal.createDialog(ErrorDialog, {
-                        title: "Failed to add tag " + newTag + " to room",
-                        description: ((err && err.message) ? err.message : "Operation failed"),
+                        title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
                 });
             }
@@ -241,4 +242,3 @@ DragSource('RoomTile', roomTileSource, function(connect, monitor) {
         isDragging: monitor.isDragging()
     };
 })(RoomTile));
-

src/components/views/settings/Notifications.js

@@ -16,6 +16,7 @@ limitations under the License.
 
 'use strict';
 var React = require('react');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 var q = require("q");
 var sdk = require('matrix-react-sdk');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
@@ -131,8 +132,8 @@ module.exports = React.createClass({
         }, (error) => {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Error saving email notification preferences",
-                description: "An error occurred whilst saving your email notification preferences.",
+                title: _t('Error saving email notification preferences'),
+                description: _t('An error occurred whilst saving your email notification preferences.'),
             });
         });
     },
@@ -175,8 +176,9 @@ module.exports = React.createClass({
 
         var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
         Modal.createDialog(TextInputDialog, {
-            title: "Keywords",
-            description: "Enter keywords separated by a comma:",
+            title: _t('Keywords'),
+            description: _t('Enter keywords separated by a comma:'),
+            button: _t('OK'),
             value: keywords,
             onFinished: function onFinished(should_leave, newValue) {
 
@@ -240,8 +242,8 @@ module.exports = React.createClass({
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Failed to change settings: " + error);
                 Modal.createDialog(ErrorDialog, {
-                    title: "Failed to change settings",
-                    description: ((error && error.message) ? error.message : "Operation failed"),
+                    title: _t('Failed to change settings'),
+                    description: ((error && error.message) ? error.message : _t('Operation failed')),
                     onFinished: self._refreshFromServer
                 });
             });
@@ -310,8 +312,8 @@ module.exports = React.createClass({
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Can't update user notification settings: " + error);
             Modal.createDialog(ErrorDialog, {
-                title: "Can't update user notification settings",
-                description: ((error && error.message) ? error.message : "Operation failed"),
+                title: _t('Can\'t update user notification settings'),
+                description: ((error && error.message) ? error.message : _t('Operation failed')),
                 onFinished: self._refreshFromServer
             });
         });
@@ -352,8 +354,8 @@ module.exports = React.createClass({
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to update keywords: " + error);
             Modal.createDialog(ErrorDialog, {
-                title: "Failed to update keywords",
-                description: ((error && error.message) ? error.message : "Operation failed"),
+                title: _t('Failed to update keywords'),
+                description: ((error && error.message) ? error.message : _t('Operation failed')),
                 onFinished: self._refreshFromServer
             });
         }
@@ -562,8 +564,8 @@ module.exports = React.createClass({
 
             // Build the rules not managed by Vector UI
             var otherRulesDescriptions = {
-                '.m.rule.message': "Notify for all other messages/rooms",
-                '.m.rule.fallback': "Notify me for anything else"
+                '.m.rule.message': _t('Notify for all other messages/rooms'),
+                '.m.rule.fallback': _t('Notify me for anything else'),
             };
 
             for (var i in defaultRules.others) {
@@ -698,7 +700,7 @@ module.exports = React.createClass({
                         </div>
                         <div className="mx_UserNotifSettings_labelCell">
                             <label htmlFor="enableNotifications">
-                                Enable notifications for this account
+                                { _t('Enable notifications for this account') }
                             </label>
                         </div>
                     </div>
@@ -713,7 +715,7 @@ module.exports = React.createClass({
                     {masterPushRuleDiv}
 
                     <div className="mx_UserSettings_notifTable">
-                        All notifications are currently disabled for all targets.
+                        { _t('All notifications are currently disabled for all targets.') }.
                     </div>
                 </div>
             );
@@ -723,13 +725,13 @@ module.exports = React.createClass({
         let emailNotificationsRow;
         if (emailThreepids.length === 0) {
             emailNotificationsRow = <div>
-                Add an email address above to configure email notifications
+                { _t('Add an email address above to configure email notifications') }
             </div>;
         } else {
             // This only supports the first email address in your profile for now
             emailNotificationsRow = this.emailNotificationsRow(
                 emailThreepids[0].address,
-                "Enable email notifications ("+emailThreepids[0].address+")"
+                _t('Enable email notifications') + ' (' + emailThreepids[0].address + ')'
             );
         }
 
@@ -737,7 +739,7 @@ module.exports = React.createClass({
         var externalRules = [];
         for (var i in this.state.externalPushRules) {
             var rule = this.state.externalPushRules[i];
-            externalRules.push(<li>{ rule.description }</li>);
+            externalRules.push(<li>{ _t(rule.description) }</li>);
         }
 
         // Show keywords not displayed by the vector UI as a single external push rule
@@ -748,12 +750,12 @@ module.exports = React.createClass({
         }
         if (externalKeyWords.length) {
             externalKeyWords = externalKeyWords.join(", ");
-            externalRules.push(<li>Notifications on the following keywords follow rules which can’t be displayed here: { externalKeyWords }</li>);
+            externalRules.push(<li>{ _t('Notifications on the following keywords follow rules which can’t be displayed here:') } { externalKeyWords }</li>);
         }
 
         var devicesSection;
         if (this.state.pushers === undefined) {
-            devicesSection = <div className="error">Unable to fetch notification target list</div>
+            devicesSection = <div className="error">{ _t('Unable to fetch notification target list') }</div>
         } else if (this.state.pushers.length == 0) {
             devicesSection = null;
         } else {
@@ -774,7 +776,7 @@ module.exports = React.createClass({
         }
         if (devicesSection) {
             devicesSection = (<div>
-                <h3>Notification targets</h3>
+                <h3>{ _t('Notification targets') }</h3>
                 { devicesSection }
             </div>);
         }
@@ -783,9 +785,9 @@ module.exports = React.createClass({
         if (externalRules.length) {
             advancedSettings = (
                 <div>
-                    <h3>Advanced notifications settings</h3>
-                    There are advanced notifications which are not shown here.<br/>
-                    You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply.
+                    <h3>{ _t('Advanced notification settings') }</h3>
+                    { _t('There are advanced notifications which are not shown here') }.<br/>
+                    { _t('You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply') }.
                     <ul>
                         { externalRules }
                     </ul>
@@ -812,7 +814,7 @@ module.exports = React.createClass({
                         </div>
                         <div className="mx_UserNotifSettings_labelCell">
                             <label htmlFor="enableDesktopNotifications">
-                                Enable desktop notifications
+                                { _t('Enable desktop notifications') }
                             </label>
                         </div>
                     </div>
@@ -830,7 +832,7 @@ module.exports = React.createClass({
                         </div>
                         <div className="mx_UserNotifSettings_labelCell">
                             <label htmlFor="enableDesktopAudioNotifications">
-                                Enable audible notifications in web client
+                                { _t('Enable audible notifications in web client') }
                             </label>
                         </div>
                     </div>
@@ -842,9 +844,9 @@ module.exports = React.createClass({
                             <thead>
                                 <tr>
                                     <th width="55%"></th>
-                                    <th width="15%">Off</th>
-                                    <th width="15%">On</th>
-                                    <th width="15%">Noisy</th>
+                                    <th width="15%">{ _t('Off') }</th>
+                                    <th width="15%">{ _t('On') }</th>
+                                    <th width="15%">{ _t('Noisy') }</th>
                                 </tr>
                             </thead>
                             <tbody>

src/i18n/strings/basefile.json

@@ -0,0 +1 @@
+{}

src/i18n/strings/be.json

@@ -0,0 +1,88 @@
+{
+    "Add an email address above to configure email notifications": "Дадайце адрас электроннай пошты вышэй, каб наладзіць апавяшчэнні",
+    "All messages": "Усе паведамленні",
+    "All messages (loud)": "Усе паведамленні (гучна)",
+    "All notifications are currently disabled for all targets.": "Усе апавяшчэнні ў цяперашні час адключаныя для ўсіх мэтаў.",
+    "An error occurred whilst saving your email notification preferences.": "Адбылася памылка падчас захавання налады апавяшчэнняў па электроннай пошце.",
+    "Cancel Sending": "Адмяніць адпраўку",
+    "Can't update user notification settings": "Немагчыма абнавіць налады апавяшчэнняў карыстальніка",
+    "Close": "Зачыніць",
+    "Create new room": "Стварыць новы пакой",
+    "Couldn't find a matching Matrix room": "Не атрымалася знайсці адпаведны пакой Matrix",
+    "Custom Server Options": "Карыстальніцкія параметры сервера",
+    "delete the alias": "выдаліць псеўданім",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Выдаліць псеўданім пакоя %(alias)s і выдаліць %(name)s з каталога?",
+    "Direct Chat": "Прамы чат",
+    "Directory": "Каталог",
+    "Dismiss": "Aдхіліць",
+    "Download this file": "Спампаваць гэты файл",
+    "Drop here %(toAction)s": "Перацягнуць сюды %(toAction)s",
+    "Enable audible notifications in web client": "Ўключыць гукавыя апавяшчэнні ў вэб-кліенце",
+    "Enable desktop notifications": "Ўключыць апавяшчэнні на працоўным стале",
+    "Enable email notifications": "Ўключыць паведамлення па электроннай пошце",
+    "Enable notifications for this account": "Ўключыць апавяшчэнні для гэтага ўліковага запісу",
+    "Enable them now": "Уключыць іх зараз",
+    "Enter keywords separated by a comma:": "Калі ласка, увядзіце ключавыя словы, падзеленыя коскамі:",
+    "Error": "Памылка",
+    "Error saving email notification preferences": "Памылка захавання налад апавяшчэнняў па электроннай пошце",
+    "#example": "#прыклад",
+    "Failed to": "Не атрымалася",
+    "Failed to add tag %(tagName)s to room": "Не атрымалася дадаць %(tagName)s ў пакоі",
+    "Failed to change settings": "Не атрымалася змяніць налады",
+    "Failed to forget room %(errCode)s": "Не атрымалася забыць пакой %(errCode)s",
+    "Failed to update keywords": "Не атрымалася абнавіць ключавыя словы",
+    "Failed to get protocol list from Home Server": "Не ўдалося атрымаць спіс пратаколаў ад хатняга сервера",
+    "Failed to get public room list": "Не ўдалося атрымаць спіс агульных пакояў",
+    "Failed to join the room": "Не ўдалося далучыцца да пакоя",
+    "Failed to remove tag %(tagName)s from room": "Не ўдалося выдаліць %(tagName)s з пакоя",
+    "Failed to set direct chat tag": "Не ўдалося ўсталяваць тэг прамога чата",
+    "Failed to set Direct Message status of room": "Не ўдалося ўсталяваць статут прамога паведамлення пакою",
+    "Favourite": "Улюбёнае",
+    "Fetching third party location failed": "Не ўдалося атрымаць месцазнаходжанне трэцяга боку",
+    "Files": "Файлы",
+    "Filter room names": "Фільтр iмёнаў пакояў",
+    "Forget": "Забыць",
+    " from room": " з пакоя",
+    "Guests can join": "Госці могуць далучыцца",
+    "Guest users can't invite users. Please register to invite": "Госцi не могуць запрашаць карыстальнікаў. Калі ласка, зарэгіструйцеся, каб запрасiць",
+    "Invite to this room": "Запрасіць у гэты пакой",
+    "Keywords": "Ключавыя словы",
+    "Leave": "Пакінуць",
+    "Low Priority": "Нізкі прыярытэт",
+    "Members": "Удзельнікі",
+    "Mentions only": "Толькі згадкі",
+    "Mute": "Без гуку",
+    "No rooms to show": "Няма пакояў для паказу",
+    "Noisy": "Шумна",
+    "Notification targets": "Мэты апавяшчэння",
+    "Notifications": "Апавяшчэнні",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Апавяшчэнні па наступных ключавых словах прытрымліваюцца правілаў, якія не могуць быць адлюстраваны тут",
+    "Notify for all other messages/rooms": "Апавяшчаць для ўсіх іншых паведамленняў/пакояў",
+    "Notify me for anything else": "Паведаміць мне што-небудзь яшчэ",
+    "Off": "Выключыць",
+    "On": "Уключыць",
+    "Operation failed": "Не атрымалася выканаць аперацыю",
+    "Permalink": "Пастаянная спасылка",
+    "Please Register": "Калі ласка, зарэгіструйцеся",
+    "powered by Matrix": "працуе на Matrix",
+    "Quote": "Цытата",
+    "Redact": "Адрэдагаваць",
+    "Reject": "Адхіліць",
+    "Remove %(name)s from the directory?": "Выдаліць %(name)s з каталога?",
+    "Remove": "Выдалiць",
+    "remove %(name)s from the directory": "выдаліць %(name)s з каталога",
+    "Remove from Directory": "Выдалiць з каталога",
+    "Resend": "Паўторна",
+    "Riot does not know how to join a room on this network": "Riot не ведае, як увайсці ў пакой у гэтай сетке",
+    "Room directory": "Каталог пакояў",
+    "Room not found": "Пакой не знойдзены",
+    "Search for a room": "Пошук па пакоі",
+    "Settings": "Налады",
+    "Source URL": "URL-адрас крыніцы",
+    "Start chat": "Пачаць чат",
+    "The Home Server may be too old to support third party networks": "Хатні сервер можа быць занадта стары для падтрымкі іншых сетак",
+    "There are advanced notifications which are not shown here": "Ёсць пашыраныя апавяшчэння, якія не паказаныя тут",
+    "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны",
+    "This room is inaccessible to guests. You may be able to join if you register": "Гэты пакой недаступны для гасцей. Вы можаце далучыцца, калі вы зарэгіструецеся",
+    " to room": " ў пакоі"
+}

src/i18n/strings/da.json

@@ -0,0 +1,84 @@
+{
+    "Add an email address above to configure email notifications": "Tilføj en emailadresse ovenfor for at konfigurere e-mail-underretninger",
+    "All notifications are currently disabled for all targets.": "Alle meddelelser er for øjeblikket deaktiveret for alle mål.",
+    "An error occurred whilst saving your email notification preferences.": "Der opstod en fejl under opbevaring af dine e-mail-underretningsindstillinger.",
+    "and remove": "Og fjern",
+    "Can't update user notification settings": "Kan ikke opdatere brugermeddelelsesindstillinger",
+    "Create new room": "Opret nyt rum",
+    "Couldn't find a matching Matrix room": "Kunne ikke finde et matchende Matrix-rum",
+    "Custom Server Options": "Brugerdefinerede serverindstillinger",
+    "delete the alias": "Slet aliaset",
+    "Delete the room alias": "Slet room alias",
+    "Direct Chat": "Personligt Chat",
+    "Directory": "Rum fortegnelse",
+    "Dismiss": "Afskedige",
+    "Drop here to": "Drop her til",
+    "Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten",
+    "Enable desktop notifications": "Aktivér desktop meddelelser",
+    "Enable email notifications": "Aktivér e-mail-underretninger",
+    "Enable notifications for this account": "Aktivér underretninger for dette brugernavn",
+    "Enable them now": "Aktivér dem nu",
+    "Enter keywords separated by a comma:": "Indtast søgeord adskilt af et komma:",
+    "Error": "Fejl",
+    "Error saving email notification preferences": "Fejl ved at gemme e-mail-underretningsindstillinger",
+    "#example": "#eksempel",
+    "Failed to": "Var ikke i stand til at",
+    "Failed to add tag ": "Kunne ikke tilføje tag ",
+    "Failed to change settings": "Kunne ikke ændre indstillinger",
+    "Failed to update keywords": "Kunne ikke opdatere søgeord",
+    "Failed to get protocol list from Home Server": "Kunne ikke få protokolliste fra Home Server",
+    "Failed to get public room list": "Kunne ikke få offentlig rumliste",
+    "Failed to join the room": "Kunne ikke komme ind i rumet",
+    "Failed to remove tag ": "Kunne ikke fjerne tag ",
+    "Failed to set Direct Message status of room": "Kunne ikke indstille direkte beskedstatus for rumet",
+    "Favourite": "Favorit",
+    "Fetching third party location failed": "Hentning af tredjeparts placering mislykkedes",
+    "Files": "Filer",
+    "Filter room names": "Filtrer rumnavne",
+    "Forget": "Glem",
+    "from the directory": "fra fortegnelsen",
+    " from room": " fra rum",
+    "Guests can join": "Gæster kan deltage",
+    "Guest users can't invite users. Please register to invite": "Gæstebrugere kan ikke invitere brugere. Tilmeld dig venligst for at invitere",
+    "Invite to this room": "Inviter til dette rum",
+    "Keywords": "Søgeord",
+    "Leave": "Forlade",
+    "Low Priority": "Lav prioritet",
+    "Members": "Medlemmer",
+    "No rooms to show": "Ingen rum at vise",
+    "Noisy": "Støjende",
+    "Notification targets": "Meddelelsesmål",
+    "Notifications": "Meddelser",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Meddelelser om følgende søgeord følger regler, der ikke kan vises her:",
+    "Notify for all other messages/rooms": "Underret om alle andre meddelelser / rum",
+    "Notify me for anything else": "Underret mig om noget andet",
+    "Off": "Slukket",
+    "On": "Tændt",
+    "Operation failed": "Operation mislykkedes",
+    "Please Register": "Vær venlig at registrere",
+    "powered by Matrix": "Drevet af Matrix",
+    "Reject": "Afvise",
+    "Remove": "Fjerne",
+    "remove": "fjerner",
+    "Remove from Directory": "Fjern fra fortegnelse",
+    "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk",
+    "Room directory": "Rum fortegnelse",
+    "Room not found": "Rumet ikke fundet",
+    "Search for a room": "Søg efter et rum",
+    "Settings": "Indstillinger",
+    "Start chat": "Begyndt chat",
+    "The Home Server may be too old to support third party networks": "Hjemmeserveren kan være for gammel til at understøtte tredjepartsnetværk",
+    "There are advanced notifications which are not shown here": "Der er avancerede meddelelser, som ikke vises her",
+    "The server may be unavailable or overloaded": "Serveren kan være utilgængelig eller overbelastet",
+    "This room is inaccessible to guests. You may be able to join if you register": "Dette rum er utilgængeligt for gæster. Du kan være i stand til at deltage, hvis du registrerer dig",
+    " to room": " til rum",
+    "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste",
+    "Unable to join network": "Kan ikke deltage i netværket",
+    "Unable to look up room ID from server": "Kunne ikke slå op på rum-id fra server",
+    "unknown error code": "Ukendt fejlkode",
+    "Unnamed room": "Unnamed rum",
+    "World readable": "Læselig til alle",
+    "You are not receiving desktop notifications": "Du modtager ikke desktop meddelelser",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du har muligvis konfigureret dem i en anden klient end Riot. Du kan ikke tune dem i Riot, men de gælder stadig",
+    "Close": "Luk"
+}

src/i18n/strings/de_DE.json

@@ -0,0 +1,131 @@
+{
+    "Please Register": "Bitte registrieren",
+    "Guest users can't invite users. Please register to invite.": "Gäste können keine User einladen. Zum Einladen bitte anmelden.",
+    "Members": "Mitglieder",
+    "Files": "Dateien",
+    "Notifications": "Benachrichtigungen",
+    "Invite to this room": "In diesen Raum einladen",
+    "Filter room names": "Raum-Namen filtern",
+    "Start chat": "Neuen Chat starten",
+    "Room directory": "Raum-Verzeichnis",
+    "Create new room": "Neuen Raum erstellen",
+    "Settings": "Einstellungen",
+    "powered by Matrix": "basierend auf Matrix",
+    "Custom Server Options": "Optionen für eigenen Server",
+    "Dismiss": "ausblenden",
+    "Failed to get protocol list from Home Server": "Fehler beim Abrufen der Protokoll-Liste vom Home-Server",
+    "The Home Server may be too old to support third party networks": "Der Home-Server ist eventuell zu alt, um Drittanbieter-Netzwerke zu unterstützen",
+    "Directory": "Raum Verzeichnis",
+    "#example:": "#beispiel:",
+    "Search for a room": "Suche einen Raum",
+    "No rooms to show": "Keine Räume zum anzeigen",
+    "World readable": "Jeder kann lesen",
+    "Guests can join": "Gäste können beitreten",
+    "You are not receiving desktop notifications": "Du erhältst keine Desktop-Benachrichtigungen",
+    "Enable them now": "Aktiviere diese jetzt",
+    "Add an email address above to configure email notifications": "Füge eine E-Mail Adresse hinzu um Benachrichtigungen via E-Mail zu erhalten",
+    "All notifications are currently disabled for all targets.": "Im Moment sind alle Benachrichtigungen für alle Ziele deaktiviert.",
+    "An error occurred whilst saving your email notification preferences.": "Beim Speichern deiner E-Mail-Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
+    "and remove": "und entfernen",
+    "Can't update user notification settings": "Kann Benutzerdefinierte Einstellungen nicht aktualisieren",
+    "Couldn't find a matching Matrix room": "Konnte keinen entsprechenden Matrix-Raum finden",
+    "delete the alias": "Lösche den Alias",
+    "Delete the room alias": "Lösche den Raum Alias",
+    "Direct Chat": "Privater Chat",
+    "Drop here to": "Hier ablegen",
+    "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren",
+    "Enable desktop notifications": "Desktop-Benachrichtigungen aktivieren",
+    "Enable email notifications": "Aktiviere E-Mail Benachrichtigungen",
+    "Enable notifications for this account": "Aktiviere Benachrichtigungen für diesen Benutzer",
+    "Enter keywords separated by a comma:": "Kommagetrennte Schlagworte eingeben:",
+    "Error": "Fehler",
+    "Error saving email notification preferences": "Fehler beim Speichern der E-Mail-Benachrichtigungseinstellungen",
+    "#example": "#Beispiel",
+    "Failed to": "Konnte nicht",
+    "Failed to add tag ": "Konnte Tag nicht hinzufügen ",
+    "Failed to change settings": "Einstellungen konnten nicht geändert werden",
+    "Failed to update keywords": "Konnte Suchbegriff nicht aktualisieren",
+    "Failed to get public room list": "Konnte keine öffentliche Raumliste laden",
+    "Failed to join the room": "Fehler beim Betreten des Raumes",
+    "Failed to remove tag ": "Konnte Tag nicht entfernen ",
+    "Failed to set Direct Message status of room": "Konnte den direkten Benachrichtigungsstatus nicht setzen",
+    "Favourite": "Favorit",
+    "Fetching third party location failed": "Das Abrufen des Drittanbieterstandorts ist fehlgeschlagen",
+    "Forget": "Lösche",
+    "from the directory": "aus dem Verzeichnis",
+    " from room": " aus dem Raum",
+    "Guest users can't invite users. Please register to invite": "Gastnutzer können keine Nutzer einladen. Bitte registriere dich um Nutzer einzuladen",
+    "Keywords": "Schlüsselwörter",
+    "Leave": "Verlassen",
+    "Low Priority": "Niedrige Priorität",
+    "Noisy": "Laut",
+    "Notification targets": "Benachrichtigungsziele",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Benachrichtigungen zu folgenden Stichwörtern folgen Regeln, die hier nicht angezeigt werden können:",
+    "Notify for all other messages/rooms": "Benachrichtigungen für alle anderen Mitteilungen/Räume aktivieren",
+    "Operation failed": "Aktion fehlgeschlagen",
+    "Reject": "ablehnen",
+    "Remove": "Entfernen",
+    "remove": "Entferner",
+    "Remove from Directory": "Aus dem Raum-Verzeichnis entfernen",
+    "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
+    "Room not found": "Raum nicht gefunden",
+    "There are advanced notifications which are not shown here": "Es existieren erweiterte Benachrichtigungen, welche hier nicht angezeigt werden",
+    "The server may be unavailable or overloaded": "Der Server ist vermutlich nicht erreichbar oder überlastet",
+    "This room is inaccessible to guests. You may be able to join if you register": "Dieser Raum ist nicht verfügbar für Gäste. Vermutlich klappt es wenn du dich anmeldest",
+    "Unable to fetch notification target list": "Nicht möglich die Zielliste für Benachrichtigungen zu erhalten",
+    "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
+    "unknown error code": "Unbekannter Fehlercode",
+    "Unnamed room": "Unbenannter Raum",
+    "Notify me for anything else": "Benachrichtige mich für alles andere",
+    "Off": "Aus",
+    "On": "An",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Client als Riot konfiguriert. Sie können in Riot nicht verändert werden, gelten aber trotzdem",
+    " to room": " an Raum",
+    "Drop here %(toAction)s": "Hierher ziehen:  %(toAction)s",
+    "All messages": "Alle Nachrichten",
+    "All messages (loud)": "Alle Nachrichten (laut)",
+    "Cancel Sending": "Senden abbrechen",
+    "Close": "Schließen",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Soll der Raumalias %(alias)s gelöscht und der %(name)s aus dem Verzeichnis entfernt werden?",
+    "Download this file": "Datei Herunterladen",
+    "Failed to add tag %(tagName)s to room": "Das Hinzufügen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
+    "Failed to forget room %(errCode)s": "Das Entfernen des Raums %(errCode)s aus deiner Liste ist fehlgeschlagen",
+    "Failed to remove tag %(tagName)s from room": "Das Entfernen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
+    "Failed to set direct chat tag": "Fehler beim setzen der Direct Chat Kennzeichnung",
+    "Mentions only": "Nur, wenn du erwähnt wirst",
+    "Mute": "Stummschalten",
+    "Permalink": "Permanenter Link",
+    "Quote": "Zitat",
+    "Redact": "Redaktionell entfernen",
+    "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
+    "remove %(name)s from the directory": "entferne %(name)s aus dem Verzeichnis",
+    "Resend": "Erneut Senden",
+    "Source URL": "Quell-URL",
+    "Unable to look up room ID from server": "Es ist nicht möglich, die Raum-ID auf dem Server nachzuschlagen",
+    "Unhide Preview": "Vorschau wieder anzeigen",
+    "Uploaded on %(date)s by %(user)s": "Hochgeladen am %(date)s durch %(user)s",
+    "View Decrypted Source": "Entschlüsselten Quellcode ansehen",
+    "View Source": "Quellcode ansehen",
+    "You cannot delete this image. (%(code)s)": "Das Bild kann nicht gelöscht werden. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Diese Nachricht kann nicht gelöscht werden. (%(code)s)",
+    "Today": "Heute",
+    "Wednesday": "Mittwoch",
+    "Thursday": "Donnerstag",
+    "Friday": "Freitag",
+    "Saturday": "Samstag",
+    "Tuesday": "Dienstag",
+    "Sunday": "Sonntag",
+    "Monday": "Montag",
+    "Yesterday": "Gestern",
+    "Welcome page": "Willkommensseite",
+    "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen",
+    "Call invitation": "Anruf-Einladung",
+    "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten",
+    "Messages containing my user name": "Nachrichten, die meinen Nutzernamen enthalten",
+    "Messages in group chats": "Nachrichten in Gruppen-Chats",
+    "Messages in one-to-one chats": "Nachrichten in Eins-zu-Eins-Chats",
+    "Messages sent by bot": "Nachrichten von Bots",
+    "more": "mehr",
+    "When I'm invited to a room": "Wenn ich in einen Raum eingeladen werde",
+    "customServer_text": "Du kannst die erweiterten Server-Optionen nutzen, um dich auf anderen Matrix-Servern anzumelden, indem du eine andere Heimserver-URL eingibst. <br/>Dies ermöglicht es dir, Riot mit einem bereits existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.<br/><br/>Du kannst auch einen benutzerdefinierten Identitäts-Server eingeben, allerdings wirst du dann nicht in der Lage sein, andere Benutzer per E-Mail-Adresse einzuladen oder selbst Einladungen per E-Mail-Adresse zu erhalten."
+}

src/i18n/strings/en_EN.json

@@ -0,0 +1,122 @@
+{
+  "Add an email address above to configure email notifications": "Add an email address above to configure email notifications",
+  "Advanced notification settings": "Advanced notification settings",
+  "All messages": "All messages",
+  "All messages (loud)": "All messages (loud)",
+  "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
+  "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
+  "Call invitation": "Call invitation",
+  "Cancel Sending": "Cancel Sending",
+  "Can't update user notification settings": "Can't update user notification settings",
+  "Close": "Close",
+  "Create new room": "Create new room",
+  "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
+  "Custom Server Options": "Custom Server Options",
+  "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
+  "delete the alias": "delete the alias",
+  "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
+  "Direct Chat": "Direct Chat",
+  "Directory": "Directory",
+  "Dismiss": "Dismiss",
+  "Download this file": "Download this file",
+  "Drop here %(toAction)s": "Drop here %(toAction)s",
+  "Enable audible notifications in web client": "Enable audible notifications in web client",
+  "Enable desktop notifications": "Enable desktop notifications",
+  "Enable email notifications": "Enable email notifications",
+  "Enable notifications for this account": "Enable notifications for this account",
+  "Enable them now": "Enable them now",
+  "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
+  "Error": "Error",
+  "Error saving email notification preferences": "Error saving email notification preferences",
+  "#example": "#example",
+  "Failed to": "Failed to",
+  "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
+  "Failed to change settings": "Failed to change settings",
+  "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
+  "Failed to update keywords": "Failed to update keywords",
+  "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
+  "Failed to get public room list": "Failed to get public room list",
+  "Failed to join the room": "Failed to join the room",
+  "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
+  "Failed to set direct chat tag": "Failed to set direct chat tag",
+  "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
+  "Favourite": "Favourite",
+  "Fetching third party location failed": "Fetching third party location failed",
+  "Files": "Files",
+  "Filter room names": "Filter room names",
+  "Forget": "Forget",
+  " from room": " from room",
+  "Guests can join": "Guests can join",
+  "Guest users can't invite users. Please register to invite": "Guest users can't invite users. Please register to invite",
+  "Invite to this room": "Invite to this room",
+  "Keywords": "Keywords",
+  "Leave": "Leave",
+  "Low Priority": "Low Priority",
+  "Members": "Members",
+  "Mentions only": "Mentions only",
+  "Messages containing my display name": "Messages containing my display name",
+  "Messages containing my user name": "Messages containing my user name",
+  "Messages in group chats": "Messages in group chats",
+  "Messages in one-to-one chats": "Messages in one-to-one chats",
+  "Messages sent by bot": "Messages sent by bot",
+  "more": "more",
+  "Mute": "Mute",
+  "No rooms to show": "No rooms to show",
+  "Noisy": "Noisy",
+  "Notification targets": "Notification targets",
+  "Notifications": "Notifications",
+  "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
+  "Notify for all other messages/rooms": "Notify for all other messages/rooms",
+  "Notify me for anything else": "Notify me for anything else",
+  "Off": "Off",
+  "On": "On",
+  "Operation failed": "Operation failed",
+  "Permalink": "Permalink",
+  "Please Register": "Please Register",
+  "powered by Matrix": "powered by Matrix",
+  "Quote": "Quote",
+  "Redact": "Redact",
+  "Reject": "Reject",
+  "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
+  "Remove": "Remove",
+  "remove %(name)s from the directory": "remove %(name)s from the directory",
+  "Remove from Directory": "Remove from Directory",
+  "Resend": "Resend",
+  "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
+  "Room directory": "Room directory",
+  "Room not found": "Room not found",
+  "Search for a room": "Search for a room",
+  "Settings": "Settings",
+  "Source URL": "Source URL",
+  "Start chat": "Start chat",
+  "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
+  "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
+  "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
+  "This room is inaccessible to guests. You may be able to join if you register": "This room is inaccessible to guests. You may be able to join if you register",
+  " to room": " to room",
+  "Unable to fetch notification target list": "Unable to fetch notification target list",
+  "Unable to join network": "Unable to join network",
+  "Unable to look up room ID from server": "Unable to look up room ID from server",
+  "Unhide Preview": "Unhide Preview",
+  "unknown error code": "unknown error code",
+  "Unnamed room": "Unnamed room",
+  "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
+  "View Decrypted Source": "View Decrypted Source",
+  "View Source": "View Source",
+  "When I'm invited to a room": "When I'm invited to a room",
+  "World readable": "World readable",
+  "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
+  "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
+  "You are not receiving desktop notifications": "You are not receiving desktop notifications",
+  "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
+  "Sunday": "Sunday",
+  "Monday": "Monday",
+  "Tuesday": "Tuesday",
+  "Wednesday": "Wednesday",
+  "Thursday": "Thursday",
+  "Friday": "Friday",
+  "Saturday": "Saturday",
+  "Today": "Today",
+  "Yesterday": "Yesterday",
+  "Welcome page": "Welcome page"
+}

src/i18n/strings/es.json

@@ -0,0 +1,116 @@
+{
+    "Add an email address above to configure email notifications": "Añade una dirección de email arriba para configurar las notificaciones por email",
+    "Advanced notification settings": "Configuración de notificaciones avanzada",
+    "All messages": "Todos los mensajes",
+    "An error occurred whilst saving your email notification preferences.": "Se ha producido un error al guardar las preferencias de notificación por email.",
+    "Call invitation": "Invitación a la llamada",
+    "Cancel Sending": "Cancelar envío",
+    "Can't update user notification settings": "No se puede actualizar la configuración de notificación de usuario",
+    "Close": "Cerrar",
+    "Create new room": "Crear nueva sala",
+    "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincidiera",
+    "Custom Server Options": "Opciones de Servidor Personalizado",
+    "customServer_text": "Puedes utilizar las opciones de servidor personalizadas para iniciar sesión en otros servidores Matrix especificando una URL de Home server distinta.<br/>Esto te permite usar Riot con una cuenta Matrix existente en un Home server distinto.<br/><br/>También puedes configurar un servidor de identidad personalizado, pero no podrás invitar usuarios por dirección de email, ni ser invitado por email por ti mismo.",
+    "delete the alias": "borrar el alias",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar la sala alias %(alias)s y retirar %(name)s del directorio?",
+    "Direct Chat": "Chat Directo",
+    "Directory": "Directorio",
+    "Download this file": "Descargar este archivo",
+    "Drop here %(toAction)s": "Soltar aquí %(toAction)s",
+    "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web",
+    "Enable desktop notifications": "Habilitar notificaciones de escritorio",
+    "Enable email notifications": "Habilitar notificaciones por email",
+    "Enable notifications for this account": "Habilitar notificaciones para esta cuenta",
+    "Enable them now": "Habilitarlos ahora",
+    "Enter keywords separated by a comma:": "Introduzca palabras clave separadas por una coma:",
+    "Error": "Error",
+    "Error saving email notification preferences": "Error al guardar las preferencias de notificación por email",
+    "#example": "#ejemplo",
+    "Failed to add tag %(tagName)s to room": "Error al añadir la etiqueta %(tagName)s a la sala",
+    "Failed to change settings": "Error al cambiar la configuración",
+    "Failed to forget room %(errCode)s": "No se pudo olvidar la habitación %(errCode)s",
+    "Failed to update keywords": "Error al actualizar las palabras clave",
+    "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos de Home Server",
+    "Failed to get public room list": "No se pudo obtener la lista de salas públicas",
+    "Failed to join the room": "No se puede unir a la habitación",
+    "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala",
+    "Failed to set direct chat tag": "Error al establecer la etiqueta de chat directo",
+    "Failed to set Direct Message status of room": "No se pudo establecer el estado de Mensaje Directo de la sala",
+    "Favourite": "Favorito",
+    "Fetching third party location failed": "Falló la obtención de la ubicación de un tercero",
+    "Files": "Archivos",
+    "Filter room names": "Filtrar los nombres de las salas",
+    "Forget": "Olvidar",
+    " from room": " de la sala",
+    "Guests can join": "Los invitados se pueden unir",
+    "Guest users can't invite users. Please register to invite": "Los usuarios invitados no pueden invitar usuarios. Por favor, regístrate para poder invitar",
+    "Invite to this room": "Invitar a esta sala",
+    "Keywords": "Palabras clave",
+    "Leave": "Salir",
+    "Low Priority": "Baja Prioridad",
+    "Members": "Miembros",
+    "Mentions only": "Sólo menciones",
+    "Messages containing my display name": "Mensajes que contienen mi nombre para mostrar",
+    "Messages containing my user name": "Mensajes que contienen mi nombre de usuario",
+    "Messages in group chats": "Mensajes en chats de grupo",
+    "Messages in one-to-one chats": "Mensajes en chats uno a uno",
+    "Messages sent by bot": "Mensajes enviados por bot",
+    "more": "más",
+    "Mute": "Mute",
+    "No rooms to show": "Sin salas para mostrar",
+    "Noisy": "Ruidoso",
+    "Notification targets": "Objetivos de notificación",
+    "Notifications": "Notificaciones",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Las notificaciones de las siguientes palabras clave siguen reglas que no se pueden mostrar aquí:",
+    "Notify me for anything else": "Notificarme para cualquier otra cosa",
+    "Off": "Apagado",
+    "On": "Encendido",
+    "Operation failed": "Operación fallida",
+    "Permalink": "Enlace permanente",
+    "Please Register": "Por favor regístrate",
+    "Quote": "Citar",
+    "Redact": "Redactar",
+    "Reject": "Rechazar",
+    "Remove %(name)s from the directory?": "¿Retirar %(name)s del directorio?",
+    "Remove": "Eliminar",
+    "remove %(name)s from the directory": "retirar %(name)s del directorio",
+    "Remove from Directory": "Retirar del Directorio",
+    "Resend": "Reenviar",
+    "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red",
+    "Room directory": "Directorio de salas",
+    "Room not found": "Sala no encontrada",
+    "Search for a room": "Buscar sala",
+    "Settings": "Ajustes",
+    "Source URL": "URL de origen",
+    "Start chat": "Comenzar chat",
+    "The Home Server may be too old to support third party networks": "El Home Server puede ser demasiado antiguo para soportar redes de terceros",
+    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
+    "The server may be unavailable or overloaded": "El servidor puede estar no disponible o sobrecargado",
+    "This room is inaccessible to guests. You may be able to join if you register": "Esta sala es inaccesible para los invitados. Puedes unirse si te registras",
+    " to room": " a la sala",
+    "Unable to fetch notification target list": "No se puede obtener la lista de objetivos de notificación",
+    "Unable to join network": "No se puede unir a la red",
+    "Unable to look up room ID from server": "No se puede buscar el ID de la sala desde el servidor",
+    "Unhide Preview": "Mostrar Vista Previa",
+    "unknown error code": "Código de error desconocido",
+    "Unnamed room": "Sala sin nombre",
+    "Uploaded on %(date)s by %(user)s": "Subido el %(date)s por %(user)s",
+    "View Decrypted Source": "Ver Fuente Descifrada",
+    "View Source": "Ver Fuente",
+    "When I'm invited to a room": "Cuando estoy invitado a una sala",
+    "World readable": "Legible por todo el mundo",
+    "You cannot delete this image. (%(code)s)": "No puedes eliminar esta imagen. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "No puedes eliminar este mensaje. (%(code)s)",
+    "You are not receiving desktop notifications": "No estás recibiendo notificaciones de escritorio",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Es posible que los hayas configurado en un cliente que no sea Riot. No puedes ajustarlos en Riot, pero todavía se aplican",
+    "Sunday": "Domingo",
+    "Monday": "Lunes",
+    "Tuesday": "Martes",
+    "Wednesday": "Miércoles",
+    "Thursday": "Jueves",
+    "Friday": "Viernes",
+    "Saturday": "Sábado",
+    "Today": "Hoy",
+    "Yesterday": "Ayer",
+    "Welcome page": "Página de bienvenida"
+}

src/i18n/strings/fi.json

@@ -0,0 +1,3 @@
+{
+    "Sunday": "Sunnuntai"
+}

src/i18n/strings/fr.json

@@ -0,0 +1,124 @@
+{
+    "Add an email address above to configure email notifications": "Ajouter une adresse email pour la configuration des notifications par email",
+    "All messages": "Tous les messages",
+    "All messages (loud)": "Tous les messages (fort)",
+    "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
+    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications par e-mail",
+    "Cancel Sending": "Annuler l'envoi",
+    "Can't update user notification settings": "Impossible de mettre à jour les notifications utilisateur",
+    "Close": "Fermer",
+    "Create new room": "Créer un nouveau salon",
+    "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix",
+    "Custom Server Options": "Options de Serveur Personnalisé",
+    "delete the alias": "Supprimer l'alias",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
+    "Direct Chat": "Conversation Directe",
+    "Directory": "Répertoire",
+    "Dismiss": "Rejeter",
+    "Download this file": "Télécharger ce fichier",
+    "Drop here %(toAction)s": "Déposer ici pour %(toAction)s",
+    "Enable audible notifications in web client": "Activer les notifications sonores pour le client web",
+    "Enable desktop notifications": "Activer les notifications de bureau",
+    "Enable email notifications": "Activer les notifications par e-mail",
+    "Enable notifications for this account": "Activer les notifications pour ce compte",
+    "Enable them now": "Les activer maintenant",
+    "Enter keywords separated by a comma:": "Entrez les mots clés séparés par une virgule",
+    "Error": "Erreur",
+    "Error saving email notification preferences": "Erreur lors de la sauvegarde des notifications par email",
+    "#example": "#exemple",
+    "Failed to": "Echec pour",
+    "Failed to add tag %(tagName)s to room": "Echec lors de l'ajout du tag %(tagName)s pour le salon",
+    "Failed to change settings": "Changement de configuration échouée",
+    "Failed to forget room %(errCode)s": "Echec lors de l'oublie du salon %(errCode)s",
+    "Failed to update keywords": "Échec dans la mise à jour des mots clés",
+    "Failed to get protocol list from Home Server": "Echec lors de la récupération depuis le serveur maison",
+    "Failed to get public room list": "Echec lors de la récupération de la liste des salons publics",
+    "Failed to join the room": "Échec de l'adhésion au salon",
+    "Failed to remove tag %(tagName)s from room": "Échec dans la suppression de l’étiquette %(tagName)s du salon",
+    "Failed to set direct chat tag": "Échec dans l'attribution d'une étiquette dans le chat direct",
+    "Favourite": "Favoris",
+    "Operation failed": "L'opération a échoué",
+    "Please Register": "Veuillez vous enregistrer",
+    "powered by Matrix": "propulsé par Matrix",
+    "Quote": "Citer",
+    "Redact": "Rédiger",
+    "Reject": "Rejeter",
+    "Remove %(name)s from the directory?": "Supprimer %(name)s du répertoire ?",
+    "Remove": "Supprimer",
+    "Resend": "Renvoyer",
+    "Settings": "Paramètres",
+    "Start chat": "Démarrer une discussion",
+    "unknown error code": "Code erreur inconnu",
+    "View Source": "Voir la source",
+    "You cannot delete this image. (%(code)s)": "Vous ne pouvez pas supprimer cette image. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Vous ne pouvez pas supprimer ce message. (%(code)s)",
+    "You are not receiving desktop notifications": "Vous ne recevez pas les notifications sur votre bureau",
+    "Sunday": "Dimanche",
+    "Monday": "Lundi",
+    "Tuesday": "Mardi",
+    "Wednesday": "Mercredi",
+    "Thursday": "Jeudi",
+    "Friday": "Vendredi",
+    "Saturday": "Samedi",
+    "Today": "Aujourd'hui",
+    "Yesterday": "Hier",
+    "Welcome page": "Page d'accueil",
+    "Call invitation": "Appel entrant",
+    "Failed to set Direct Message status of room": "Échec de la configuration de l'état de Message Direct du salon",
+    "Fetching third party location failed": "Échec de la récupération de la localisation tierce",
+    "Files": "Fichiers",
+    "Filter room names": "Filtrer les noms des salons",
+    "Forget": "Oublier",
+    " from room": " du salon",
+    "Guest users can't invite users. Please register to invite": "Les invités ne peuvent démarrer une discussion. Merci de vous enregistrer pour pouvoir démarrer une discussion",
+    "Invite to this room": "Inviter dans ce salon",
+    "Keywords": "Mots-clés",
+    "Leave": "Quitter",
+    "Low Priority": "Priorité Basse",
+    "Members": "Membres",
+    "Mentions only": "Seulement les mentions",
+    "Messages containing my display name": "Messages contenant mon nom",
+    "Messages containing my user name": "Message contenant mon nom d'utilisateur",
+    "Messages in group chats": "Messages dans les conversations de groupe",
+    "Messages in one-to-one chats": "Messages dans les conversations directes",
+    "Messages sent by bot": "Messages envoyés par des robots",
+    "more": "plus",
+    "Mute": "Muet",
+    "No rooms to show": "Aucun salon à afficher",
+    "Noisy": "Sonore",
+    "Notification targets": "Appareils recevant les notifications",
+    "Notifications": "Notifications",
+    "Notifications on the following keywords follow rules which can’t be displayed here": "Les mots-clés suivants suivent des règles de notification qui ne peuvent être affichées ici",
+    "Notify for all other messages/rooms": "Me notifier pour tous les autres messages/salons",
+    "Notify me for anything else": "Me notifier pour tout le reste",
+    "Off": "Désactivé",
+    "On": "Activé",
+    "Permalink": "Permalien",
+    "remove %(name)s from the directory": "supprimer %(name)s du répertoire",
+    "Remove from Directory": "Supprimer du répertoire",
+    "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau",
+    "Room directory": "Répertoire des salons",
+    "Room not found": "Salon non trouvé",
+    "Search for a room": "Chercher un salon",
+    "Source URL": "URL source",
+    "The Home Server may be too old to support third party networks": "Le Home Server semble trop ancien pour supporter des réseaux tiers",
+    "There are advanced notifications which are not shown here": "Il existe une configuration avancée des notifications qui ne peut être affichée ici",
+    "The server may be unavailable or overloaded": "Le serveur est indisponible ou surchargé",
+    "This room is inaccessible to guests. You may be able to join if you register": "Ce salon n'est pas ouvert aux invités. Vous pourrez peut-être le rejoindre si vous vous enregistrez",
+    "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
+    "Unable to join network": "Impossible de rejoindre le réseau",
+    "Unable to look up room ID from server": "Impossible de récupérer l'ID du salon sur le serveur",
+    "Unhide Preview": "Dévoiler l'aperçu",
+    "Unnamed room": "Salon anonyme",
+    "Uploaded on %(date)s by %(user)s": "Téléchargé le %(date)s par %(user)s",
+    "View Decrypted Source": "Voir la source décryptée",
+    "When I'm invited to a room": "Quand je suis invité dans un salon",
+    "World readable": "Visible par tout le monde",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vous les avez probablement configurées dans un autre client que Riot. Vous ne pouvez pas les configurer dans Riot mais elles s'appliquent quand même",
+    "Guests can join": "Ouvert aux invités",
+    " to room": " au salon",
+    "Advanced notification settings": "Paramètres de notifications avancés",
+    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications mail.",
+    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse différente pour Home serveur.<br/>Cela permet d'utiliser Riot avec un compte existant sur un Home serveur différent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots clés suivant répondent à des critères qui ne peuvent pas être affichés ici :"
+}

src/i18n/strings/hu.json

@@ -0,0 +1,68 @@
+{
+    "Add an email address above to configure email notifications": "E-mail értesítés beállításához írd be az e-mail címed",
+    "Advanced notification settings": "Haladó értesítési beállítások",
+    "All messages": "Minden üzenet",
+    "All messages (loud)": "Minden üzenet (hangos)",
+    "All notifications are currently disabled for all targets.": "Minden céleszközön minden értesítés tiltva van.",
+    "An error occurred whilst saving your email notification preferences.": "Hiba történt az e-mail értesítés beállításánál.",
+    "Call invitation": "Hívás meghívó",
+    "Cancel Sending": "Küldés megszakítása",
+    "Can't update user notification settings": "Nem sikerül frissíteni az értesítési beállításokat",
+    "Close": "Bezár",
+    "Create new room": "Új szoba készítés",
+    "Couldn't find a matching Matrix room": "Nem található a keresett Matrix szoba",
+    "Custom Server Options": "Egyedi szerver beállítások",
+    "delete the alias": "becenév törlése",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Törlöd a(z) %(alias)s szobát és kiveszed a könyvtárból ezt: %(name)s?",
+    "Direct Chat": "Közvetlen csevegés",
+    "Directory": "Könyvtár",
+    "Dismiss": "Eltűntet",
+    "Download this file": "Fájl letöltése",
+    "Drop here %(toAction)s": "%(toAction)s -t húzd ide",
+    "Enable audible notifications in web client": "Hallható értesítések engedélyezése a webes kliensben",
+    "Enable desktop notifications": "Asztali értesítések engedélyezése",
+    "Enable email notifications": "E-mail értesítések engedélyezése",
+    "Enable notifications for this account": "Értesítések engedélyezése a fiókhoz",
+    "Enable them now": "Engedélyezés most",
+    "Enter keywords separated by a comma:": "Kulcsszavak vesszővel elválasztva:",
+    "Error": "Hiba",
+    "Error saving email notification preferences": "Hiba email értesítés beállításának mentésénél",
+    "#example": "#példa",
+    "Failed to": "Nem lehet",
+    "Failed to add tag %(tagName)s to room": "Nem lehet a címkét hozzáadni a szobához: %(tagName)s",
+    "Failed to change settings": "Nem lehet a beállítást megváltoztatni",
+    "Failed to forget room %(errCode)s": "Nem lehet eltávolítani a szobát: %(errCode)s",
+    "Failed to update keywords": "Nem lehet a kulcsszavakat frissíteni",
+    "Failed to get protocol list from Home Server": "Nem lehet a protokoll listát lekérni a Saját szerverről",
+    "Failed to get public room list": "Nem lehet lekérdezni a nyílt szobák listáját",
+    "Failed to join the room": "Nem lehet csatlakozni a szobához",
+    "Failed to remove tag %(tagName)s from room": "Nem lehet törölni a(z) %(tagName)s címkét a szobáról",
+    "Failed to set direct chat tag": "Nem lehet a címkét beállítani a közvetlen beszélgetéshez",
+    "Failed to set Direct Message status of room": "Nem lehet beállítani a Közvetlen beszélgetés státuszt a szobához",
+    "Favourite": "Kedvenc",
+    "Fetching third party location failed": "Nem sikerült lekérdezni a harmadik felet",
+    "Files": "Fájlok",
+    "Filter room names": "Szoba nevek szűrése",
+    "Forget": "Elfelejt",
+    " from room": " szobából",
+    "Guests can join": "Vendégek csatlakozhatnak",
+    "Guest users can't invite users. Please register to invite": "Vendég felhasználó nem küldhet meghívót. Kérlek regisztrálj meghívó küldéshez",
+    "Invite to this room": "Meghívás a szobába",
+    "Keywords": "Kulcsszavak",
+    "Leave": "Elhagy",
+    "Low Priority": "Alacsony priorítás",
+    "Members": "Résztvevők",
+    "Mentions only": "Csak ha megemlítenek",
+    "Messages containing my display name": "Az üzenet tartalmazza a nevem",
+    "Messages containing my user name": "Az üzenet tartalmazza a felhasználói nevem",
+    "Messages in group chats": "Üzenetek a csoportszobában",
+    "Messages in one-to-one chats": "Üzenetek közvetlen beszélgetésekben",
+    "Messages sent by bot": "Botok által küldött üzenetek",
+    "more": "további",
+    "Mute": "Elnémít",
+    "No rooms to show": "Nincs megjeleníthető szoba",
+    "Noisy": "Hangos",
+    "Notification targets": "Értesítések célpontja",
+    "Notifications": "Értesítések",
+    "Notify for all other messages/rooms": "Értesítés minden más üzenethez/szobához"
+}

src/i18n/strings/ml.json

@@ -0,0 +1,5 @@
+{
+    "Add an email address above to configure email notifications": "ഇ മെയില്‍ അറിയിപ്പുകൾ ലഭിക്കാന്‍ മുകളില്‍ ഇ-മെയില്‍ വിലാസം നല്‍കൂ",
+    "All messages": "എല്ലാ സന്ദേശങ്ങളും",
+    "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)"
+}

src/i18n/strings/nb_NO.json

@@ -0,0 +1,13 @@
+{
+    "Add an email address above to configure email notifications": "Legg til en epost adresse for å sette opp epost varsling",
+    "Advanced notification settings": "Avanserte varslingsinnstillinger",
+    "All messages": "Alle meldinger",
+    "All messages (loud)": "Alle meldinger (høy)",
+    "All notifications are currently disabled for all targets.": "Alle varsler er deaktivert for alle mottakere.",
+    "An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.",
+    "Cancel Sending": "Avbryt sending",
+    "Can't update user notification settings": "Kan ikke oppdatere brukervarsel innstillinger",
+    "Close": "Lukk",
+    "Create new room": "Opprett nytt rom",
+    "Couldn't find a matching Matrix room": "Kunne ikke finne et samsvarende Matrix rom"
+}

src/i18n/strings/nl.json

@@ -0,0 +1,122 @@
+{
+    "Add an email address above to configure email notifications": "Voeg een email adres toe om email notificaties te ontvangen",
+    "Advanced notification settings": "Geavanceerde notificatie instellingen",
+    "All messages": "Alle berichten",
+    "All messages (loud)": "Alle berichten (luid)",
+    "All notifications are currently disabled for all targets.": "Alle notificaties zijn op het moment uitgeschakeld voor alle doelen.",
+    "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van jouw email notificatie voorkeuren.",
+    "Call invitation": "Audio gesprek uitnodiging",
+    "Cancel Sending": "Annuleren verzending",
+    "Can't update user notification settings": "Het is niet gelukt om de gebruiker notificatie instellingen bij te werken",
+    "Close": "Sluiten",
+    "Create new room": "Maak een nieuwe kamer",
+    "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix kamer te vinden",
+    "Custom Server Options": "Aangepaste server instellingen",
+    "customServer_text": "Je kunt de aangepaste server instellingen gebruiken om in te loggen bij andere Matrix servers door een andere home server URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix account op een andere home server.<br/><br/>Je kunt ook een aangepaste identiteit server instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een email adres of zelf uitgenodigt te worden met een email adres.",
+    "delete the alias": "verwijder de alias",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Verwijder de alias %(alias)s en verwijder %(name)s uit de map?",
+    "Direct Chat": "Privé gesprek",
+    "Directory": "Kamer lijst",
+    "Dismiss": "Afwijzen",
+    "Download this file": "Download dit bestand",
+    "Enable audible notifications in web client": "Zet notificaties aan in de web client",
+    "Enable desktop notifications": "Zet desktop notificaties aan",
+    "Enable email notifications": "Zet email notificaties aan",
+    "Enable notifications for this account": "Zet notificaties aan voor dit account",
+    "Enable them now": "Zet ze nu aan",
+    "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gesplitst door een komma:",
+    "Error": "Fout",
+    "Error saving email notification preferences": "Fout bij het opslaan van de email notificatie voorkeuren",
+    "#example": "#voorbeeld",
+    "Failed to": "Mislukt om",
+    "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen",
+    "Failed to change settings": "Het is mislukt om de instellingen te wijzigen",
+    "Failed to forget room %(errCode)s": "Het is mislukt om de kamer te vergeten %(errCode)s",
+    "Failed to update keywords": "Het is mislukt om de trefwoorden bij te werken",
+    "Failed to get protocol list from Home Server": "Het is mislukt om de protocol lijst op te halen van de home server",
+    "Failed to get public room list": "Het is mislukt om de lijst van publieke kamers op te halen",
+    "Failed to join the room": "Het is mislukt om de kamer toe te treden",
+    "Failed to remove tag %(tagName)s from room": "Het is mislukt om de label %(tagName)s van de kamer te verwijderen",
+    "Failed to set direct chat tag": "Het is mislukt om de privé chat label weg te halen",
+    "Favourite": "Favoriet",
+    "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
+    "Files": "Bestanden",
+    "Filter room names": "Filter kamer namen",
+    "Forget": "Vergeten",
+    " from room": " van kamer",
+    "Guests can join": "Gasten kunnen toe treden",
+    "Guest users can't invite users. Please register to invite": "Gasten kunnen geen gebruikers uitnodigen. Om anderen uit te nodigen zult u moeten registreren",
+    "Invite to this room": "Uitnodigen voor deze kamer",
+    "Keywords": "Trefwoorden",
+    "Leave": "Verlaten",
+    "Low Priority": "Lage prioriteit",
+    "Members": "Leden",
+    "Mentions only": "Alleen vermeldingen",
+    "Messages containing my display name": "Berichten die mijn weergavenaam bevatten",
+    "Messages containing my user name": "Berichten die mijn gebruikersnaam bevatten",
+    "Messages in group chats": "Berichten in groep gesprekken",
+    "Messages in one-to-one chats": "Berichten in één-op-één gesprekken",
+    "Messages sent by bot": "Berichten verzonden bij een bot",
+    "more": "meer",
+    "Mute": "Dempen",
+    "No rooms to show": "Geen kamers om te laten zien",
+    "Noisy": "Luidruchtig",
+    "Notification targets": "Notificatie doelen",
+    "Notifications": "Notificaties",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificaties op de volgende trefwoorden volgen regels die hier niet kunnen worden laten zien:",
+    "Notify for all other messages/rooms": "Informeer mij voor alle andere berichten/kamers",
+    "Notify me for anything else": "Informeer mij voor al het andere",
+    "Off": "Uit",
+    "On": "Aan",
+    "Operation failed": "Actie mislukt",
+    "Permalink": "Permalink",
+    "Please Register": "Registreer alsjeblieft",
+    "powered by Matrix": "aangedreven door Matrix",
+    "Quote": "Quote",
+    "Reject": "Afwijzen",
+    "Remove %(name)s from the directory?": "Verwijder %(name)s uit de kamer lijst?",
+    "Remove": "Verwijder",
+    "remove %(name)s from the directory": "verwijder %(name)s uit de kamer lijst",
+    "Remove from Directory": "Verwijder uit de kamer lijst",
+    "Resend": "Opnieuw verzenden",
+    "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet toetreden tot een kamer op dit netwerk",
+    "Room directory": "Kamer lijst",
+    "Room not found": "De kamer is niet gevonden",
+    "Search for a room": "Zoek naar een kamer",
+    "Settings": "Instellingen",
+    "Source URL": "Bron URL",
+    "Start chat": "Start gesprek",
+    "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen",
+    "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet worden laten zien",
+    "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbeladen",
+    "This room is inaccessible to guests. You may be able to join if you register": "Deze kamer is niet toegankelijk voor gasten. Je zou misschien toe kunnen treden als je geregistreerd bent",
+    " to room": " naar kamer",
+    "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatie doelen op te halen",
+    "Unable to join network": "Het is mislukt om toe te treden tot dit netwerk",
+    "Unable to look up room ID from server": "Het is mislukt om de kamer ID op te halen van de server",
+    "Unhide Preview": "Zichtbaar maken preview",
+    "unknown error code": "niet bekende foutcode",
+    "Unnamed room": "Kamer zonder naam",
+    "Uploaded on %(date)s by %(user)s": "Geüpload op %(date)s door %(user)s",
+    "View Decrypted Source": "Bekijk gedecodeerde bron",
+    "View Source": "Bekijk bron",
+    "When I'm invited to a room": "Wanneer ik uitgenodigt wordt naar een kamer",
+    "World readable": "Door iedereen leesbaar",
+    "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%code)s)",
+    "You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)",
+    "You are not receiving desktop notifications": "Je ontvangt momenteel geen desktop notificaties",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Je hebt ze mogelijk ingesteld in een andere client dan Riot. Je kunt ze niet aanpassen in Riot maar ze zijn wel actief",
+    "Sunday": "Zondag",
+    "Monday": "Maandag",
+    "Tuesday": "Dinsdag",
+    "Wednesday": "Woensdag",
+    "Thursday": "Donderdag",
+    "Friday": "Vrijdag",
+    "Saturday": "Zaterdag",
+    "Today": "Vandaag",
+    "Yesterday": "Gisteren",
+    "Welcome page": "Welkom pagina",
+    "Drop here %(toAction)s": "%(toAction)s hier naar toe verplaatsen",
+    "Failed to set Direct Message status of room": "Het is mislukt om de directe berichten status van de kamer in te stellen",
+    "Redact": "Redigeren"
+}

src/i18n/strings/pl.json

@@ -0,0 +1 @@
+{}

src/i18n/strings/pt.json

@@ -0,0 +1,115 @@
+{
+    "Add an email address above to configure email notifications": "Adicione um endereço de email acima para configurar as notificações por email",
+    "All messages": "Todas as mensagens",
+    "All messages (loud)": "Todas as mensagens (alto)",
+    "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto salvava suas preferências de notificação por email.",
+    "Cancel Sending": "Cancelar o envio",
+    "Can't update user notification settings": "Não é possível atualizar as preferências de notificação",
+    "Close": "Fechar",
+    "Create new room": "Criar nova sala",
+    "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
+    "Custom Server Options": "Opções de customização do servidor",
+    "delete the alias": "apagar o apelido da sala",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
+    "Direct Chat": "Conversa pessoal",
+    "Directory": "Diretório",
+    "Dismiss": "Encerrar",
+    "Download this file": "Baixar este arquivo",
+    "Drop here %(toAction)s": "Arraste aqui para %(toAction)s",
+    "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
+    "Enable desktop notifications": "Ativar notificações no desktop",
+    "Enable email notifications": "Ativar notificações por email",
+    "Enable notifications for this account": "Ativar notificações para esta conta",
+    "Enable them now": "Habilitar agora",
+    "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:",
+    "Error": "Erro",
+    "Error saving email notification preferences": "Erro ao salvar as preferências de notificação por email",
+    "#example:": "#exemplo",
+    "Failed to": "Falha ao",
+    "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala",
+    "Failed to change settings": "Falha ao mudar as preferências",
+    "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s",
+    "Failed to update keywords": "Falha ao alterar as palavras-chave",
+    "Failed to get protocol list from Home Server": "Falha em acessar a lista de protocolos do servidor padrão",
+    "Failed to get public room list": "Falha ao acessar a lista pública de salas",
+    "Failed to join the room": "Falha ao entrar na sala",
+    "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala",
+    "Failed to set direct chat tag": "Falha ao definir conversa como pessoal",
+    "Failed to set Direct Message status of room": "Falha em definr a mensagem de status da sala",
+    "Favourite": "Favorito",
+    "Fetching third party location failed": "Falha ao acessar localização de terceiros",
+    "Files": "Arquivos",
+    "Filter room names": "Filtrar salas por título",
+    "Forget": "Esquecer",
+    " from room": " da sala",
+    "Guests can join": "Convidados podem entrar",
+    "Guest users can't invite users. Please register to invite": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites",
+    "Invite to this room": "Convidar para esta sala",
+    "Keywords": "Palavras-chave",
+    "Leave": "Sair",
+    "Low Priority": "Baixa prioridade",
+    "Members": "Membros",
+    "Mentions only": "Apenas menções",
+    "Mute": "Mudo",
+    "No rooms to show": "Não existem salas a serem exibidas",
+    "Noisy": "Barulhento",
+    "Notification targets": "Alvos de notificação",
+    "Notifications": "Notificações",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificações sobre as seguintes palavras-chave seguem regras que não podem ser exibidas aqui:",
+    "Notify for all other messages/rooms": "Notificar para todas as outras mensagens e salas",
+    "Notify me for anything else": "Notificar-me sobre qualquer outro evento",
+    "Off": "Desativado",
+    "On": "Ativado",
+    "Operation failed": "A operação falhou",
+    "Permalink": "Link permanente",
+    "Please Register": "Por favor, cadastre-se",
+    "powered by Matrix": "distribuído por Matrix",
+    "Quote": "Citar",
+    "Redact": "Remover",
+    "Reject": "Rejeitar",
+    "Remove": "Remover",
+    "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
+    "remove %(name)s from the directory": "remover %(name)s da lista pública de salas",
+    "Remove from Directory": "Remover da lista pública de salas",
+    "Resend": "Reenviar",
+    "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
+    "Room directory": "Lista de salas públicas",
+    "Room not found": "Sala não encontrada",
+    "Search for a room": "Procurar por uma sala",
+    "Settings": "Configurações",
+    "Source URL": "URL fonte",
+    "Start chat": "Começar conversa",
+    "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros",
+    "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
+    "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
+    "This room is inaccessible to guests. You may be able to join if you register": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre",
+    " to room": " na sala",
+    "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
+    "Unable to join network": "Não foi possível conectar na rede",
+    "Unable to look up room ID from server": "Não foi possivel buscar identificação da sala no servidor",
+    "Unhide Preview": "Mostrar a pré-visualização novamente",
+    "unknown error code": "código de erro desconhecido",
+    "Unnamed room": "Sala sem nome",
+    "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
+    "View Decrypted Source": "Ver a fonte descriptografada",
+    "View Source": "Ver a fonte",
+    "World readable": "Público",
+    "You cannot delete this image. (%(code)s)": "Você não pode apagar esta imagem. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Você não pode apagar esta mensagem. (%(code)s)",
+    "You are not receiving desktop notifications": "Você não está recebendo notificações desktop",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Você pode te-las configurado em outro cliente além do Riot. Você não pode ajustá-las no Riot, mas ainda assim elas se aplicam aqui",
+    "Sunday": "Domingo",
+    "Monday": "Segunda",
+    "Tuesday": "Terça",
+    "Wednesday": "Quarta",
+    "Thursday": "Quinta",
+    "Friday": "Sexta",
+    "Saturday": "Sábado",
+    "Today": "Hoje",
+    "Yesterday": "Ontem",
+    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os recipientes.",
+    "#example": "#exemplo",
+    "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
+    "Notifications on the following keywords follow rules which can’t be displayed here": "As notificações sobre as palavras-chave abaixo seguem regras que não podem ser mostradas aqui",
+    "Welcome page": "Página de boas vindas"
+}

src/i18n/strings/pt_BR.json

@@ -0,0 +1,122 @@
+{
+    "Add an email address above to configure email notifications": "Insira um endereço de email no campo acima para configurar suas notificações por email",
+    "All messages": "Todas as mensagens",
+    "All messages (loud)": "Todas as mensagens (alto)",
+    "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto o sistema estava salvando suas preferências de notificação por email.",
+    "Call invitation": "Convite para chamada",
+    "Cancel Sending": "Cancelar o envio",
+    "Can't update user notification settings": "Não é possível atualizar as preferências de notificação",
+    "Close": "Fechar",
+    "Create new room": "Criar nova sala",
+    "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
+    "Custom Server Options": "Opções de personalização do servidor",
+    "delete the alias": "apagar o apelido da sala",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
+    "Direct Chat": "Conversa pessoal",
+    "Directory": "Diretório",
+    "Dismiss": "Encerrar",
+    "Download this file": "Baixar este arquivo",
+    "Drop here %(toAction)s": "Arraste aqui para %(toAction)s",
+    "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
+    "Enable desktop notifications": "Ativar notificações no desktop",
+    "Enable email notifications": "Ativar notificações por email",
+    "Enable notifications for this account": "Ativar notificações para esta conta",
+    "Enable them now": "Habilitar agora",
+    "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:",
+    "Error": "Erro",
+    "Error saving email notification preferences": "Erro ao salvar as preferências de notificação por email",
+    "#example:": "#exemplo",
+    "Failed to": "Falha ao",
+    "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala",
+    "Failed to change settings": "Falhou ao mudar as preferências",
+    "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
+    "Failed to update keywords": "Falhou ao alterar as palavras-chave",
+    "Failed to get protocol list from Home Server": "Falha em acessar a lista de protocolos do servidor padrão",
+    "Failed to get public room list": "Falha ao acessar a lista pública de salas",
+    "Failed to join the room": "Falhou ao entrar na sala",
+    "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala",
+    "Failed to set direct chat tag": "Falha ao definir conversa como pessoal",
+    "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala",
+    "Favourite": "Favorito",
+    "Fetching third party location failed": "Falha ao acessar localização de terceiros",
+    "Files": "Arquivos",
+    "Filter room names": "Filtrar salas por título",
+    "Forget": "Esquecer",
+    " from room": " da sala",
+    "Guests can join": "Convidados podem entrar",
+    "Guest users can't invite users. Please register to invite": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites",
+    "Invite to this room": "Convidar para esta sala",
+    "Keywords": "Palavras-chave",
+    "Leave": "Sair",
+    "Low Priority": "Baixa prioridade",
+    "Members": "Membros",
+    "Mentions only": "Apenas menções",
+    "Messages containing my display name": "Mensagens contendo meu nome público",
+    "Messages containing my user name": "Mensagens contendo meu nome de usuário",
+    "Messages in group chats": "Mensagens em salas",
+    "Messages in one-to-one chats": "Mensagens em conversas pessoais",
+    "Messages sent by bot": "Mensagens enviadas por bots",
+    "more": "ver mais",
+    "Mute": "Mudo",
+    "No rooms to show": "Não existem salas a serem exibidas",
+    "Noisy": "Barulhento",
+    "Notification targets": "Alvos de notificação",
+    "Notifications": "Notificações",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificações sobre as seguintes palavras-chave seguem regras que não podem ser exibidas aqui:",
+    "Notify for all other messages/rooms": "Notificar para todas as outras mensagens e salas",
+    "Notify me for anything else": "Notificar-me sobre qualquer outro evento",
+    "Off": "Desativado",
+    "On": "Ativado",
+    "Operation failed": "A operação falhou",
+    "Permalink": "Link permanente",
+    "Please Register": "Por favor, cadastre-se",
+    "powered by Matrix": "distribuído por Matrix",
+    "Quote": "Citar",
+    "Redact": "Remover",
+    "Reject": "Rejeitar",
+    "Remove": "Remover",
+    "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
+    "remove %(name)s from the directory": "remover %(name)s da lista pública de salas",
+    "Remove from Directory": "Remover da lista pública de salas",
+    "Resend": "Reenviar",
+    "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
+    "Room directory": "Lista de salas públicas",
+    "Room not found": "Sala não encontrada",
+    "Search for a room": "Procurar por uma sala",
+    "Settings": "Configurações",
+    "Source URL": "URL fonte",
+    "Start chat": "Começar conversa",
+    "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros",
+    "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
+    "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
+    "This room is inaccessible to guests. You may be able to join if you register": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre",
+    " to room": " para sala",
+    "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
+    "Unable to join network": "Não foi possível conectar na rede",
+    "Unable to look up room ID from server": "Não foi possível buscar identificação da sala no servidor",
+    "Unhide Preview": "Mostrar a pré-visualização novamente",
+    "unknown error code": "código de erro desconhecido",
+    "Unnamed room": "Sala sem nome",
+    "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
+    "View Decrypted Source": "Ver a fonte descriptografada",
+    "View Source": "Ver a fonte",
+    "When I'm invited to a room": "Quando sou convidada(o) a uma sala",
+    "World readable": "Público",
+    "You cannot delete this image. (%(code)s)": "Você não pode apagar esta imagem. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Você não pode apagar esta mensagem. (%(code)s)",
+    "You are not receiving desktop notifications": "Você não está recebendo notificações desktop",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Você pode te-las configurado em outro cliente além do Riot. Você não pode ajustá-las no Riot, mas ainda assim elas se aplicam aqui",
+    "Sunday": "Domingo",
+    "Monday": "Segunda",
+    "Tuesday": "Terça",
+    "Wednesday": "Quarta",
+    "Thursday": "Quinta",
+    "Friday": "Sexta",
+    "Saturday": "Sábado",
+    "Today": "Hoje",
+    "Yesterday": "Ontem",
+    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os destinatários.",
+    "#example": "#exemplo",
+    "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
+    "Welcome page": "Página de boas vindas"
+}

src/i18n/strings/ru.json

@@ -0,0 +1,129 @@
+{
+    "Add an email address above to configure email notifications": "Добавьте email адрес для оповещений",
+    "All notifications are currently disabled for all targets.": "Все оповещения отключены.",
+    "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек оповещения по электронной почте.",
+    "and remove": "и удалить",
+    "Can't update user notification settings": "Не возможно обновить пользовательские настройки оповещения",
+    "Create new room": "Создать комнату",
+    "Couldn't find a matching Matrix room": "Не возможно найти подходящую Матрикс комнату",
+    "Custom Server Options": "Настройки пользовательского сервера",
+    "delete the alias": "удалить привязку",
+    "Delete the room alias": "Удалить привязку комнаты",
+    "Direct Chat": "Персональное сообщение",
+    "Directory": "Каталог",
+    "Dismiss": "Отмена",
+    "Drop here to": "Перетащите сюда",
+    "Enable audible notifications in web client": "Включить звуковые оповещения в веб клиенте",
+    "Enable desktop notifications": "Включить оповещения на рабочем столе",
+    "Enable email notifications": "Включить оповещения по электронной почте",
+    "Enable notifications for this account": "Включить оповещения для этого аккаунта",
+    "Enable them now": "Включить сейчас",
+    "Enter keywords separated by a comma:": "Введите ключевые слова, разделенные запятой",
+    "Error": "Ошибка",
+    "Error saving email notification preferences": "Ошибка сохранения настроек оповещений по электронной почте",
+    "#example": "#пример",
+    "Failed to": "Не удалось",
+    "Failed to add tag ": "Не удалось добавить тег ",
+    "Failed to change settings": "Не удалось изменить настройки",
+    "Failed to update keywords": "Не удалось обновить ключевые слова",
+    "Failed to get protocol list from Home Server": "Не удалось получить список протоколов с Пользовательского Сервера",
+    "Failed to get public room list": "Не удалось получить список общих комнат",
+    "Failed to join the room": "Не удалось войти в комнату",
+    "Failed to remove tag ": "Не удалось удалить тег ",
+    "Failed to set Direct Message status of room": "Не удалось задать статус комнаты Персональное Сообщение",
+    "Favourite": "Избранное",
+    "Fetching third party location failed": "Не удалось получить местоположение",
+    "Files": "Файлы",
+    "Filter room names": "Отфильтровать по названию комнаты",
+    "Forget": "Забыть",
+    "from the directory": "из каталога",
+    " from room": " из комнаты",
+    "Guests can join": "Гость может присоединиться",
+    "Guest users can't invite users. Please register to invite": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглошений",
+    "Invite to this room": "Пригласить в эту комнату",
+    "Keywords": "Ключевые слова",
+    "Leave": "Покинуть",
+    "Low Priority": "Низкий приоритет",
+    "Members": "Пользователи",
+    "No rooms to show": "Нет комнат для отображения",
+    "Noisy": "Звук",
+    "Notification targets": "Цели уведомления",
+    "Notifications": "Уведомления",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по следующим ключевым словам соответствуют правилам, которые нельзя отобразить здесь",
+    "Notify for all other messages/rooms": "Уведомить обо всех других сообщениях/комнатах",
+    "Notify me for anything else": "Уведомить меня обо всем кроме",
+    "Off": "Выключить",
+    "On": "Включить",
+    "Operation failed": "Операция не удалась",
+    "Please Register": "Пожалуйста, зарегистрируйтесь",
+    "powered by Matrix": "разработано в Matrix",
+    "Reject": "Отклонить",
+    "Remove": "Удалить",
+    "remove": "удалить",
+    "Remove from Directory": "Удалить из каталога",
+    "Riot does not know how to join a room on this network": "Riot не знает как войти в комнату в этой сети",
+    "Room directory": "Каталог комнат",
+    "Room not found": "Комната не найдена",
+    "Search for a room": "Искать комнату",
+    "Settings": "Настройки",
+    "Start chat": "Начать чат",
+    "The Home Server may be too old to support third party networks": "Пользовательский сервер может быть слишком старым для поддержки сторонних сетей",
+    "There are advanced notifications which are not shown here": "Здесь расширенные уведомления, которые здесь не показаны",
+    "The server may be unavailable or overloaded": "Возможно сервер недоступен или перегружен",
+    "This room is inaccessible to guests. You may be able to join if you register": "Эта комната недоступна для гостей. Вы можете присоединиться, если зарегистрируетесь",
+    " to room": " к комнате",
+    "Unable to fetch notification target list": "Не удалось получить список целей уведомления",
+    "Unable to join network": "Не возможно присоединиться к сети",
+    "Unable to look up room ID from server": "Не возможно найти ID комнаты на сервере",
+    "unknown error code": "неизвестная ошибка",
+    "Unnamed room": "Комната без названия",
+    "World readable": "Доступно всем",
+    "You are not receiving desktop notifications": "Вы не получаете уведомления на рабочем столе",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Вы могли настроить их в клиенте, отличном от Riot. Вы не можете настроить их в Riot, но они все еще применяются",
+    "All messages": "Все сообщения",
+    "All messages (loud)": "Все сообщения (громко)",
+    "Cancel Sending": "Отмена отправки",
+    "Close": "Закрыть",
+    "Download this file": "Скачать этот файл",
+    "Drop here %(toAction)s": "Вставить сюда для %(toAction)s",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и очистить %(name)s из каталога?",
+    "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
+    "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
+    "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты",
+    "Failed to set direct chat tag": "Не удалось пометить прямую беседу",
+    "Unhide Preview": "Показать предпросмотр",
+    "Uploaded on %(date)s by %(user)s": "Загружено %(date)s  %(user)s",
+    "View Decrypted Source": "Просмотр зашыфрованного источника",
+    "View Source": "Просмотр источника",
+    "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Вы не можете удалить это сообщение. (%(code)s)",
+    "Sunday": "Воскресенье",
+    "Monday": "Понедельник",
+    "Tuesday": "Вторник",
+    "Wednesday": "Среда",
+    "Thursday": "Четверг",
+    "Friday": "Пятница",
+    "Saturday": "Суббота",
+    "Today": "Сегодня",
+    "Yesterday": "Вчера",
+    "Mentions only": "Только упоминание",
+    "Mute": "Беззвучный",
+    "Permalink": "Пстоянная ссылка",
+    "Quote": "Цитата",
+    "Redact": "Удалить",
+    "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
+    "remove %(name)s from the directory": "удалить %(name)s из каталога",
+    "Resend": "Переслать снова",
+    "Source URL": "Исходный URL",
+    "Welcome page": "Домашняя страница",
+    "Advanced notification settings": "Настройки уведомлений",
+    "Call invitation": "Звонок",
+    "customServer_text": "Вы можете войти с помощью вашего сервера.<br/>Это позволяет вам использовать Riot с уже существующей учетной записью на другом сервере.<br/><br/>Вы также можете задать свой сервер идентификации, но тогда вы не можете приглашать пользователей с помощью email-адреса и не можете быть приглашены по нему.",
+    "Messages containing my display name": "Сообщения, содержащие мое отображаемое имя",
+    "Messages containing my user name": "Сообщение, содержащие мое имя пользователя",
+    "Messages in group chats": "Сообщения в групповых чатах",
+    "Messages in one-to-one chats": "Сообщения в приватных чатах",
+    "Messages sent by bot": "Сообщения, отправленные ботом",
+    "more": "больше",
+    "When I'm invited to a room": "Когда я приглашен в комнату"
+}

src/i18n/strings/sv.json

@@ -0,0 +1,40 @@
+{
+    "Add an email address above to configure email notifications": "Lägg till en epostadress här för att konfigurera epostaviseringar",
+    "Advanced notification settings": "Avancerade aviseringsinställingar",
+    "All messages": "Alla meddelanden",
+    "All messages (loud)": "Alla meddelanden (högljudd)",
+    "All notifications are currently disabled for all targets.": "Alla aviseringar är för tillfället avstängda för alla mål.",
+    "An error occurred whilst saving your email notification preferences.": "Ett fel uppstod då epostaviseringsinställningarna sparades.",
+    "Call invitation": "Inbjudan till samtal",
+    "Cancel Sending": "Avbryt sändning",
+    "Can't update user notification settings": "Kan inte uppdatera aviseringsinställningarna",
+    "Close": "Stäng",
+    "Create new room": "Nytt rum",
+    "Couldn't find a matching Matrix room": "Kunde inte hitta ett matchande Matrix-rum",
+    "Custom Server Options": "Egna serverinställningar",
+    "customServer_text": "Du kan använda serverinställningarna för att logga in i en annan Matrix-server genom att specifiera en URL till en annan hemserver.<br/>Så här kan du använda Riot med ett existerande Matrix-konto på en annan hemserver.<br/><br/>Du kan också specifiera en egen identitetsserver, men du kommer inte att kunna bjuda in andra via epostadress, eller bli inbjuden via epostadress.",
+    "delete the alias": "radera adressen",
+    "Direct Chat": "Direkt chatt",
+    "Directory": "Katalog",
+    "Dismiss": "Avvisa",
+    "Download this file": "Ladda ner filen",
+    "Drop here %(toAction)s": "Dra hit för att %(toAction)s",
+    "Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten",
+    "Enable desktop notifications": "Sätt på skrivbordsaviseringar",
+    "Enable email notifications": "Sätt på epostaviseringar",
+    "Enable notifications for this account": "Sätt på aviseringar för det här kontot",
+    "Enable them now": "Sätt på nu",
+    "Enter keywords separated by a comma:": "Skriv in nyckelord, separerade med kommatecken",
+    "Error": "Fel",
+    "Error saving email notification preferences": "Ett fel uppstod då epostaviseringsinställningarna sparades",
+    "Failed to": "Det gick inte att",
+    "Failed to add tag %(tagName)s to room": "Det gick inte att lägga till \"%(tagName)s\" till rummet",
+    "Failed to change settings": "Det gick inte att spara inställningarna",
+    "Failed to forget room %(errCode)s": "Det gick inte att glömma bort rummet: %(errCode)s",
+    "Failed to update keywords": "Det gick inte att uppdatera nyckelorden",
+    "Failed to get protocol list from Home Server": "Det gick inte att hämta protokollistan från hemservern",
+    "Failed to get public room list": "Det gick inte att hämta listan över offentliga rum",
+    "Failed to join the room": "Det gick inte att ansluta till rummet",
+    "Failed to remove tag %(tagName)s from room": "Det gick inte att radera taggen %(tagName)s från rummet",
+    "Failed to set direct chat tag": "Det gick inte att markera rummet som direkt chatt"
+}

src/i18n/strings/uk.json

@@ -0,0 +1 @@
+{}

src/i18n/strings/zh_Hant.json

@@ -0,0 +1 @@
+{}

src/skins/vector/css/matrix-react-sdk/structures/_FilePanel.scss

@@ -112,4 +112,3 @@ limitations under the License.
 .mx_FilePanel .mx_EventTile_selected .mx_EventTile_line {
     padding-left: 0px;
 }
-

src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss

@@ -131,6 +131,10 @@ limitations under the License.
     position: absolute;
 }
 
+.mx_UserSettings_language {
+    width: 200px;
+}
+
 .mx_UserSettings_profileTable
 {
     display: table;

src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss

@@ -175,7 +175,8 @@ limitations under the License.
 }
 
 .mx_Login_type_dropdown {
-    width: 125px;
+    display: inline-block;
+    min-width: 125px;
     align-self: flex-end;
 }
 

src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss

@@ -37,6 +37,7 @@ limitations under the License.
     font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
     font-size: 14px;
     color: $primary-fg-color;
+    background-color: $primary-bg-color;
 
     border-radius: 3px;
     border: solid 1px $input-border-color;

src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss

@@ -183,6 +183,10 @@ limitations under the License.
     visibility: visible;
 }
 
+.mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp {
+    visibility: visible;
+}
+
 .mx_EventTile_selected .mx_MessageTimestamp {
     left: 3px;
 }
@@ -263,6 +267,14 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_EventTile_12hr .mx_EventTile_e2eIcon {
+    padding-left: 5px;
+}
+
+.mx_EventTile_12hr .mx_MessageTimestamp {
+    text-align: center;
+}
+
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
     padding-left: 60px;

src/vector/index.js

@@ -62,6 +62,8 @@ var VectorConferenceHandler = require('../VectorConferenceHandler');
 var UpdateChecker = require("./updater");
 var q = require('q');
 var request = require('browser-request');
+import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
+import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
 
 import url from 'url';
 
@@ -228,8 +230,9 @@ function onLoadCompleted() {
     }
 }
 
-
 async function loadApp() {
+    await loadLanguage();
+
     const fragparts = parseQsFromFragment(window.location);
     const params = parseQs(window.location);
 
@@ -309,4 +312,22 @@ async function loadApp() {
     }
 }
 
+async function loadLanguage() {
+    const prefLang = UserSettingsStore.getLocalSetting('language');
+    let langs = [];
+
+    if (!prefLang) {
+        languageHandler.getLanguagesFromBrowser().forEach((l) => {
+            langs.push(...languageHandler.getNormalizedLanguageKeys(l));
+        });
+    } else {
+        langs = [prefLang];
+    }
+    try {
+        await languageHandler.setLanguage(langs);
+    } catch (e) {
+        console.error("Unable to set language", e);
+    }
+}
+
 loadApp();

src/vector/platform/ElectronPlatform.js

@@ -54,7 +54,19 @@ function platformFriendlyName(): string {
     }
 }
 
+function _onAction(payload: Object) {
+    // Whitelist payload actions, no point sending most across
+    if (['call_state'].includes(payload.action)) {
+        ipcRenderer.send('app_onAction', payload);
+    }
+}
+
 export default class ElectronPlatform extends VectorBasePlatform {
+    constructor() {
+        super();
+        dis.register(_onAction);
+    }
+
     setNotificationCount(count: number) {
         if (this.notificationCount === count) return;
         super.setNotificationCount(count);
@@ -71,7 +83,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
     }
 
     displayNotification(title: string, msg: string, avatarUrl: string, room: Object): Notification {
-
         // GNOME notification spec parses HTML tags for styling...
         // Electron Docs state all supported linux notification systems follow this markup spec
         // https://github.com/electron/electron/blob/master/docs/tutorial/desktop-environment-integration.md#linux

test/app-tests/loading.js

@@ -28,6 +28,7 @@ import jssdk from 'matrix-js-sdk';
 
 import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
 
 import test_utils from '../test-utils';
 import MockHttpBackend from '../mock-request';
@@ -61,6 +62,10 @@ describe('loading:', function () {
 
         windowLocation = null;
         matrixChat = null;
+
+        languageHandler.setMissingEntryGenerator(function(key) {
+            return key.split('|', 2)[1];
+        });
     });
 
     afterEach(function() {

test/skin-sdk.js

@@ -5,4 +5,4 @@
  */
 
 var sdk = require('matrix-react-sdk');
-sdk.loadSkin(require('component-index'));
+sdk.loadSkin(require('../src/component-index'));

test/unit-tests/notifications/ContentRules-test.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var notifications = require('notifications');
+var notifications = require('../../../src/notifications');
 
 var ContentRules = notifications.ContentRules;
 var PushRuleVectorState = notifications.PushRuleVectorState;

test/unit-tests/notifications/PushRuleVectorState-test.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var notifications = require('notifications');
+var notifications = require('../../../src/notifications');
 
 var prvs = notifications.PushRuleVectorState;