v1.0.2-rc.1

Prepare changelog for v1.0.2-rc.1
v1.0.2-rc.1
2019-03-01 12:22:19 +00:00 · 2019-03-01 12:22:18 +00:00 · 2019-03-01 12:20:32 +00:00 · 2019-03-01 12:19:28 +00:00 · 2019-03-01 12:13:28 +00:00 · 2019-03-01 12:03:19 +00:00
100 changed files with 585 additions and 1051 deletions
--- a/.github/ISSUE_TEMPLATE/redesign_issue.md
+++ b/.github/ISSUE_TEMPLATE/redesign_issue.md
@@ -1,32 +0,0 @@
---
-name: Redesign Issue
-about: Bugs, feedback or feature requests specifically associated with the Redesign
-  project (https://riot.im/experimental)
-title: ''
-labels: redesign
-assignees: ''
-
---
-
-<!-- Thanks for providing feedback on the redesign! By filling out the sections with your information, you will help the us to process your issue.
-->
-
- **Browser**: Chrome, Safari, Firefox? which version?
- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-
-### Description
-
-Describe here the problem that you are experiencing, or the feature you are requesting.
-Include screenshots if possible: you can drag and drop images below.
-
-### Steps to reproduce
-
- For bugs, list the steps
- that reproduce the bug
- using hyphens as bullet points
-
-Describe how what happens differs from what you expected.
-
-Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
-link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
-file a bug here too! -->
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,5 +24,5 @@ install:
    # commit.
    - npm install && scripts/fetch-develop.deps.sh --depth 1
 script:
-    - npm run test
+    - CHROME_BIN='/usr/bin/google-chrome-stable' npm run test
    - npm run lint
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,71 @@
+Changes in [1.0.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.1) (2019-03-01)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.1...v1.0.2-rc.1)
+
+ * Set a require alias for the webapp directory
+   [\#9014](https://github.com/vector-im/riot-web/pull/9014)
+ * Update from Weblate.
+   [\#8973](https://github.com/vector-im/riot-web/pull/8973)
+ * set chrome path for travis CI explicitly
+   [\#8987](https://github.com/vector-im/riot-web/pull/8987)
+ * Updated install spinner
+   [\#8984](https://github.com/vector-im/riot-web/pull/8984)
+ * Allow disabling update mechanism
+   [\#8911](https://github.com/vector-im/riot-web/pull/8911)
+ * Allow configuration of whether closing window closes or minimizes to tray
+   [\#8908](https://github.com/vector-im/riot-web/pull/8908)
+ * Fix language file path for Jenkins
+   [\#8854](https://github.com/vector-im/riot-web/pull/8854)
+ * Document and recommend `default_server_name`
+   [\#8832](https://github.com/vector-im/riot-web/pull/8832)
+ * Cache busting for icons & language files
+   [\#8710](https://github.com/vector-im/riot-web/pull/8710)
+ * Remove redesign issue template
+   [\#8722](https://github.com/vector-im/riot-web/pull/8722)
+ * Make scripts/make-icons.sh work on linux
+   [\#8550](https://github.com/vector-im/riot-web/pull/8550)
+
+Changes in [1.0.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.1) (2019-02-15)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0...v1.0.1)
+
+
+Changes in [1.0.0](https://github.com/vector-im/riot-web/releases/tag/v1.0.0) (2019-02-14)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0-rc.2...v1.0.0)
+
+ * Add snipping lines to welcome page without guests
+   [\#8634](https://github.com/vector-im/riot-web/pull/8634)
+ * Add home page to fix loading tests
+   [\#8625](https://github.com/vector-im/riot-web/pull/8625)
+
+Changes in [1.0.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.0-rc.2) (2019-02-14)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0-rc.1...v1.0.0-rc.2)
+
+ * Update from Weblate.
+   [\#8615](https://github.com/vector-im/riot-web/pull/8615)
+ * Replace favicon assets to ones with transparent backgrounds
+   [\#8600](https://github.com/vector-im/riot-web/pull/8600)
+ * Refreshed icons
+   [\#8594](https://github.com/vector-im/riot-web/pull/8594)
+ * Fix order of fetch-develop-deps / npm install
+   [\#8566](https://github.com/vector-im/riot-web/pull/8566)
+ * Revive building dark theme
+   [\#8540](https://github.com/vector-im/riot-web/pull/8540)
+ * Update from Weblate.
+   [\#8546](https://github.com/vector-im/riot-web/pull/8546)
+ * Repair app loading tests after welcome page
+   [\#8525](https://github.com/vector-im/riot-web/pull/8525)
+ * Support configurable welcome background and logo
+   [\#8528](https://github.com/vector-im/riot-web/pull/8528)
+ * Update from Weblate.
+   [\#8518](https://github.com/vector-im/riot-web/pull/8518)
+ * Document `embeddedPages` configuration
+   [\#8514](https://github.com/vector-im/riot-web/pull/8514)
+ * README.md : Syntax Coloring
+   [\#8502](https://github.com/vector-im/riot-web/pull/8502)
+
 Changes in [1.0.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.0-rc.1) (2019-02-08)
 ====================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.9...v1.0.0-rc.1)
--- a/README.md
+++ b/README.md
@@ -1,28 +1,27 @@
 Riot
 ====

-Riot (formerly known as Vector) is a Matrix web client built using the Matrix
-React SDK (https://github.com/matrix-org/matrix-react-sdk).
+Riot (formerly known as Vector) is a Matrix web client built using the [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk).

 Getting Started
 ===============

-The easiest way to test Riot is to just use the hosted copy at
-https://riot.im/app.  The develop branch is continuously deployed by Jenkins at
-https://riot.im/develop for those who like living dangerously.
+The easiest way to test Riot is to just use the hosted copy at https://riot.im/app.
+The `develop` branch is continuously deployed by Jenkins at https://riot.im/develop
+for those who like living dangerously.

 To host your own copy of Riot, the quickest bet is to use a pre-built
 released version of Riot:

 1. Download the latest version from https://github.com/vector-im/riot-web/releases
 1. Untar the tarball on your web server
-1. Move (or symlink) the riot-x.x.x directory to an appropriate name
+1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name
 1. If desired, copy `config.sample.json` to `config.json` and edit it
   as desired. See below for details.
 1. Enter the URL into your browser and log into Riot!

 Releases are signed by PGP, and can be checked against the public key
-at https://riot.im/packages/keys/riot.asc
+at https://riot.im/packages/keys/riot.asc .

 Note that Chrome does not allow microphone or webcam access for sites served
 over http (except localhost), so for working VoIP you will need to serve Riot
@@ -69,16 +68,22 @@ to build.
   is at least v5.x).
 1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`.
 1. Switch to the riot-web directory: `cd riot-web`.
+1. Install the prerequisites: `npm install`.
 1. If you're using the `develop` branch then it is recommended to set up a proper
   development environment ("Setting up a dev environment" below) however one can
   install the develop versions of the dependencies instead:
-   ```
+   ```bash
   scripts/fetch-develop.deps.sh
   ```
+   Note that running `npm install` will undo the symlinks put in place by
+   `scripts/fetch-develop.deps.sh` so you should run `npm install` first, or
+   run `npm link matrix-js-sdk` and `npm link matrix-react-sdk` after running
+   `npm install`.
+
   Whenever you git pull on riot-web you will also probably need to force an update
   to these dependencies - the simplest way is to re-run the script, but you can also
   manually update and rebuild them:
-   ```
+   ```bash
   cd matrix-js-sdk
   git pull
   npm install # re-run to pull in any new dependencies
@@ -94,18 +99,16 @@ to build.
   Or just use https://riot.im/develop - the continuous integration release of the
   develop branch. (Note that we don't reference the develop versions in git directly
   due to https://github.com/npm/npm/issues/3055.)
-1. Install the prerequisites: `npm install`.
 1. Configure the app by copying `config.sample.json` to `config.json` and
   modifying it (see below for details).
 1. `npm run dist` to build a tarball to deploy. Untaring this file will give
   a version-specific directory containing all the files that need to go on your
   web server.

-Note that `npm run dist` is not supported on Windows, so Windows users can run `npm
-run build`, which will build all the necessary files into the `webapp`
-directory. The version of Riot will not appear in Settings without
-using the dist script. You can then mount the `webapp` directory on your
-webserver to actually serve up the app, which is entirely static content.
+Note that `npm run dist` is not supported on Windows, so Windows users can run `npm run build`,
+which will build all the necessary files into the `webapp` directory. The version of Riot
+will not appear in Settings without using the dist script. You can then mount the
+`webapp` directory on your webserver to actually serve up the app, which is entirely static content.

 config.json
 ===========
@@ -113,22 +116,34 @@ config.json
 You can configure the app by copying `config.sample.json` to
 `config.json` and customising it:

-For a good example, see https://riot.im/develop/config.json
+For a good example, see https://riot.im/develop/config.json.

-1. `default_hs_url` is the default homeserver url.
-1. `default_is_url` is the default identity server url (this is the server used
-   for verifying third party identifiers like email addresses). If this is blank,
-   registering with an email address, adding an email address to your account,
-   or inviting users via email address will not work.  Matrix identity servers are
-   very simple web services which map third party identifiers (currently only email
-   addresses) to matrix IDs: see http://matrix.org/docs/spec/identity_service/unstable.html
-   for more details.  Currently the only public matrix identity servers are https://matrix.org
-   and https://vector.im.  In future identity servers will be decentralised.
+1. `default_server_name` sets the default server name to use for authentication.
+   This will trigger Riot to ask
+   `https://<server_name>/.well-known/matrix/client` for the homeserver and
+   identity server URLs to use. This is the recommended approach for setting a
+   default server. However, it is also possible to use the following to directly
+   configure each of the URLs:
+   * `default_hs_url` sets the default homeserver URL.
+   * `default_is_url` sets the default identity server URL (this is the server used
+      for verifying third party identifiers like email addresses). If this is blank,
+      registering with an email address, adding an email address to your account,
+      or inviting users via email address will not work.  Matrix identity servers are
+      very simple web services which map third party identifiers (currently only email
+      addresses) to matrix IDs: see http://matrix.org/docs/spec/identity_service/unstable.html
+      for more details.  Currently the only public matrix identity servers are https://matrix.org
+      and https://vector.im.  In the future, identity servers will be decentralised.
+   * Riot will report an error if you accidentally configure both `default_server_name` _and_ `default_hs_url` since it's unclear which should take priority.
 1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user
   in the `labs` section of settings.  The available optional experimental features vary from
   release to release.
 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
   homeserver know what email template to use when talking to you.
+1. `branding`: Configures various branding and logo details, such as:
+    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
+       during authentication flows
+    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
+       authentication flows
 1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
   server is not Riot and normally not your homeserver either. The integration server settings
   may be left blank to disable integrations.
@@ -158,6 +173,13 @@ For a good example, see https://riot.im/develop/config.json
    1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
    1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
 1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
+1. `embeddedPages`: Configures the pages displayed in portions of Riot that
+   embed static files, such as:
+    1. `welcomeUrl`: Initial content shown on the outside of the app when not
+       logged in. Defaults to `welcome.html` supplied with Riot.
+    1. `homeUrl`: Content shown on the inside of the app when a specific room is
+       not selected. By default, no home page is configured. If one is set, a
+       button to access it will be shown in the top left menu.


 Note that `index.html` also has an og:image meta tag that is set to an image
@@ -183,15 +205,15 @@ To run as a desktop app:
   `npm run build` instead of `npm run dist` (since we don't need the tarball).
 2. Install electron and run it:

-   ```
+   ```bash
   npm install electron
   npm run electron
   ```

 To build packages, use electron-builder. This is configured to output:
- * dmg + zip for macOS
- * exe + nupkg for Windows
- * deb for Linux
+ * `dmg` + `zip` for macOS
+ * `exe` + `nupkg` for Windows
+ * `deb` for Linux
 But this can be customised by editing the `build` section of package.json
 as per https://github.com/electron-userland/electron-builder/wiki/Options

@@ -199,7 +221,7 @@ See https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Bu
 for dependencies required for building packages for various platforms.

 The only platform that can build packages for all three platforms is macOS:
-```
+```bash
 brew install wine --without-x11
 brew install mono
 brew install gnu-tar
@@ -221,7 +243,7 @@ Other options for running as a desktop app:
 * https://github.com/krisak/vector-electron-desktop
 * @asdf:matrix.org points out that you can use nativefier and it just works(tm)

-```
+```bash
 sudo npm install nativefier -g
 nativefier https://riot.im/app/
 ```
@@ -229,13 +251,13 @@ nativefier https://riot.im/app/
 Development
 ===========

-Before attempting to develop on Riot you **must** read the developer guide
-for `matrix-react-sdk` at https://github.com/matrix-org/matrix-react-sdk, which
+Before attempting to develop on Riot you **must** read the [developer guide
+for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk), which
 also defines the design, architecture and style for Riot too.

-You should also familiarise yourself with the "Here be Dragons" guide to the
-tame & not-so-tame dragons (gotchas) which exist in the codebase:
-https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM
+You should also familiarise yourself with the ["Here be Dragons" guide
+](https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM)
+to the tame & not-so-tame dragons (gotchas) which exist in the codebase.

 The idea of Riot is to be a relatively lightweight "skin" of customisations on
 top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
@@ -260,46 +282,57 @@ having to manually rebuild each time.

 First clone and build `matrix-js-sdk`:

-1. `git clone https://github.com/matrix-org/matrix-js-sdk.git`
-1. `pushd matrix-js-sdk`
-1. `git checkout develop`
-1. `npm install`
-1. `npm install source-map-loader`  # because webpack is made of fail (https://github.com/webpack/webpack/issues/1472)
-1. `popd`
+``` bash
+git clone https://github.com/matrix-org/matrix-js-sdk.git
+pushd matrix-js-sdk
+git checkout develop
+npm install
+npm install source-map-loader  # because webpack is made of fail
+# see https://github.com/webpack/webpack/issues/1472
+popd
+```

 Then similarly with `matrix-react-sdk`:

-1. `git clone https://github.com/matrix-org/matrix-react-sdk.git`
-1. `pushd matrix-react-sdk`
-1. `git checkout develop`
-1. `npm link ../matrix-js-sdk`
-1. `popd`
+```bash
+git clone https://github.com/matrix-org/matrix-react-sdk.git
+pushd matrix-react-sdk
+git checkout develop
+npm link ../matrix-js-sdk
+popd
+```

 Finally, build and start Riot itself:

-1. `git clone https://github.com/vector-im/riot-web.git`
-1. `cd riot-web`
-1. `git checkout develop`
-1. `npm install`
-1. `npm link ../matrix-js-sdk`
-1. `npm link ../matrix-react-sdk`
-1. `npm start`
-1. Wait a few seconds for the initial build to finish; you should see something like:
-    ```
-    Hash: b0af76309dd56d7275c8
-    Version: webpack 1.12.14
-    Time: 14533ms
-             Asset     Size  Chunks             Chunk Names
-         bundle.js   4.2 MB       0  [emitted]  main
-        bundle.css  91.5 kB       0  [emitted]  main
-     bundle.js.map  5.29 MB       0  [emitted]  main
-    bundle.css.map   116 kB       0  [emitted]  main
-        + 1013 hidden modules
-    ```
+```bash
+git clone https://github.com/vector-im/riot-web.git
+cd riot-web
+git checkout develop
+npm install
+npm link ../matrix-js-sdk
+npm link ../matrix-react-sdk
+npm start
+```
+
+Wait a few seconds for the initial build to finish; you should see something like:
+```
+Hash: b0af76309dd56d7275c8
+Version: webpack 1.12.14
+Time: 14533ms
+         Asset     Size  Chunks             Chunk Names
+     bundle.js   4.2 MB       0  [emitted]  main
+    bundle.css  91.5 kB       0  [emitted]  main
+ bundle.js.map  5.29 MB       0  [emitted]  main
+bundle.css.map   116 kB       0  [emitted]  main
+    + 1013 hidden modules
+```
   Remember, the command will not terminate since it runs the web server
   and rebuilds source files when they change. This development server also
   disables caching, so do NOT use it in production.
-1. Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
+
+Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
+
+___

 When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
 automatically picked up by webpack and built.
--- a/electron_app/build/icon.icns
+++ b/electron_app/build/icon.icns
--- a/electron_app/build/icon.ico
+++ b/electron_app/build/icon.ico
--- a/electron_app/build/icons/128x128.png
+++ b/electron_app/build/icons/128x128.png
--- a/electron_app/build/icons/16x16.png
+++ b/electron_app/build/icons/16x16.png
--- a/electron_app/build/icons/24x24.png
+++ b/electron_app/build/icons/24x24.png
--- a/electron_app/build/icons/256x256.png
+++ b/electron_app/build/icons/256x256.png
--- a/electron_app/build/icons/48x48.png
+++ b/electron_app/build/icons/48x48.png
--- a/electron_app/build/icons/512x512.png
+++ b/electron_app/build/icons/512x512.png
--- a/electron_app/build/icons/64x64.png
+++ b/electron_app/build/icons/64x64.png
--- a/electron_app/build/icons/96x96.png
+++ b/electron_app/build/icons/96x96.png
--- a/electron_app/build/install-spinner.gif
+++ b/electron_app/build/install-spinner.gif
--- a/electron_app/img/riot.ico
+++ b/electron_app/img/riot.ico
--- a/electron_app/img/riot.png
+++ b/electron_app/img/riot.png
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,11 +2,12 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.2-rc.1",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "dependencies": {
    "auto-launch": "^5.0.1",
+    "electron-store": "^2.0.0",
    "electron-window-state": "^4.1.0",
    "minimist": "^1.2.0",
    "png-to-ico": "^1.0.2"
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -35,6 +35,7 @@ const updater = require('./updater');
 const { migrateFromOldOrigin } = require('./originMigrator');

 const windowStateKeeper = require('electron-window-state');
+const Store = require('electron-store');

 // boolean flag set whilst we are doing one-time origin migration
 // We only serve the origin migration script while we're actually
@@ -55,8 +56,11 @@ try {
    // Continue with the defaults (ie. an empty config)
 }

+const store = new Store();
+
 let mainWindow = null;
 global.appQuitting = false;
+global.minimizeToTray = store.get('minimizeToTray', true);


 // handle uncaught errors otherwise it displays
@@ -136,6 +140,12 @@ ipcMain.on('ipcCall', async function(ev, payload) {
                launcher.disable();
            }
            break;
+        case 'getMinimizeToTrayEnabled':
+            ret = global.minimizeToTray;
+            break;
+        case 'setMinimizeToTrayEnabled':
+            store.set('minimizeToTray', global.minimizeToTray = args[0]);
+            break;
        case 'getAppVersion':
            ret = app.getVersion();
            break;
@@ -147,6 +157,7 @@ ipcMain.on('ipcCall', async function(ev, payload) {
            } else {
                mainWindow.focus();
            }
+            break;
        case 'origin_migrate':
            migratingOrigin = true;
            await migrateFromOldOrigin();
@@ -262,10 +273,12 @@ app.on('ready', () => {
            path: absTarget,
        });
    }, (error) => {
-        if (error) console.error('Failed to register protocol')
+        if (error) console.error('Failed to register protocol');
    });

-    if (vectorConfig['update_base_url']) {
+    if (argv['no-update']) {
+        console.log('Auto update disabled via command line flag "--no-update"');
+    } else if (vectorConfig['update_base_url']) {
        console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`);
        updater.start(vectorConfig['update_base_url']);
    } else {
@@ -331,7 +344,7 @@ app.on('ready', () => {
        mainWindow = global.mainWindow = null;
    });
    mainWindow.on('close', (e) => {
-        if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
+        if (global.minimizeToTray && !global.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)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -78,7 +78,7 @@ module.exports = function (config) {
                watched: false, included: false, served: true, nocache: false,
            },
            {
-                pattern: 'res/themes/**',
+                pattern: 'res/**',
                watched: false, included: false, served: true, nocache: false,
            },
        ],
@@ -87,6 +87,8 @@ module.exports = function (config) {
            // redirect img links to the karma server. See above.
            "/img/": "/base/node_modules/matrix-react-sdk/res/img/",
            "/themes/": "/base/res/themes/",
+            "/welcome.html": "/base/res/welcome.html",
+            "/welcome/": "/base/res/welcome/",
        },

        // preprocess matching files before serving them to the browser
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "riot-web",
-  "version": "0.17.8",
+  "version": "1.0.2-rc.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.2-rc.1",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -70,8 +70,8 @@
    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
    "gfm.css": "^1.1.2",
    "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "1.0.0-rc.1",
-    "matrix-react-sdk": "1.0.0-rc.1",
+    "matrix-js-sdk": "1.0.1-rc.1",
+    "matrix-react-sdk": "1.0.2-rc.2",
    "modernizr": "^3.6.0",
    "prop-types": "^15.6.2",
    "react": "^15.6.0",
@@ -102,7 +102,7 @@
    "cross-env": "^4.0.0",
    "css-loader": "^2.1.0",
    "electron-builder": "^20.38.5",
-    "electron-builder-squirrel-windows": "^11.6.1",
+    "electron-builder-squirrel-windows": "^20.38.5",
    "electron-devtools-installer": "^2.2.4",
    "emojione": "^2.2.7",
    "eslint": "^5.8.0",
@@ -125,6 +125,7 @@
    "karma-spec-reporter": "0.0.31",
    "karma-summary-reporter": "^1.5.1",
    "karma-webpack": "4.0.0-beta.0",
+    "loader-utils": "^1.2.3",
    "matrix-mock-request": "^1.2.2",
    "matrix-react-test-utils": "^0.2.0",
    "minimist": "^1.2.0",
@@ -151,7 +152,7 @@
  },
  "build": {
    "appId": "im.riot.app",
-    "electronVersion": "4.0.4",
+    "electronVersion": "4.0.6",
    "files": [
      "node_modules/**",
      "src/**",
--- a/res/home-status.html
+++ b/res/home-status.html
@@ -1,192 +0,0 @@
-<style type="text/css">
-
-/* we deliberately inline style here to avoid flash-of-CSS problems, and to avoid
- * voodoo where we have to set display: none by default
- */
-
-.mx_HomePage_container {
-    text-align: center;
-    display: block ! important;
-    width: 690px;
-    margin: 20px;
-}
-
-.mx_HomePage_header {
-    margin-top: 37px;
-    margin-left: 10px;
-    width: 670px;
-    box-sizing: border-box;
-    font-size: 18px;
-    background-color: #fff;
-    box-shadow: 0px 2px 10px 0px rgba(48,55,81,0.05);
-    border-radius: 5px;
-    padding: 20px 80px 20px 80px;
-    align-items: center;
-}
-
-.mx_HomePage_header h1 {
-    font-size: 29px;
-    margin-bottom: 10px;
-}
-
-.mx_HomePage_intro h2 {
-    margin-top: 32px;
-    font-size: 25px;
-    color: #49555F;
-}
-
-.mx_HomePage_intro {
-    margin: auto;
-    width: 600px;
-    margin-top: 40px;
-    margin-bottom: 40px;
-    font-size: 18px;
-}
-
-.mx_HomePage_coc {
-    font-size: 16px;
-}
-
-.mx_HomePage_coc a {
-    color: #4360DF;
-}
-
-.mx_HomePage_room, .mx_HomePage_telegram {
-    float: left;
-    background-color: #fff;
-    box-shadow: 0px 2px 10px 0px rgba(48,55,81,0.05);
-    border-radius: 5px;
-    margin: 10px;
-    width: 210px;
-    height: 250px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.mx_HomePage_telegram {
-    background-color: transparent;
-    border: 1px solid rgba(113, 129, 142, 0.2);
-    box-shadow: none;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-    font-size: 16px;
-    line-height: 25px;
-    box-sizing: border-box;
-}
-
-.mx_HomePage_telegram a {
-    text-transform: uppercase;
-    color: #4360DF;
-    font-size: 13px;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    opacity: 1.0;
-    transition: opacity .2s ease;
-}
-
-.mx_HomePage_telegram a:hover {
-    opacity: 0.5;
-}
-
-.mx_HomePage_room .mx_HomePage_icon {
-    margin-top: 24px;
-    margin-bottom: 16px;
-    width: 50px;
-    height: 50px;
-}
-
-.mx_HomePage_room .mx_HomePage_name {
-    display: block;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    font-size: 15px;
-    color: #49555F;
-    line-height: 25px;
-    margin: 0px 12px 0px 12px;
-}
-
-.mx_HomePage_room .mx_HomePage_desc {
-    flex: 1;
-    display: block;
-    margin: 0px 12px 0px 12px;
-    font-size: 14px;
-    line-height: 20px;
-}
-
-.mx_HomePage_button {
-    align-self: normal;
-    margin: 12px;
-    border-radius: 8px;
-    border: 1px solid rgba(199, 206, 209, 0.12);
-    background-color: #6CC1F6;
-    font-size: 13px;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    color: #fff ! important;
-    cursor: pointer;
-    outline: none;
-    padding: 14px;
-    box-sizing: border-box;
-    padding-left: 1.5em;
-    padding-right: 1.5em;
-}
-
-</style>
-
-<div class="mx_HomePage_container">
-    <div class="mx_HomePage_header">
-        <div>
-            <h1>Welcome to Status Community Chat, powered by Riot.</h1>
-            <p>For contributors, developers and Ethereum-enthusiasts who care about the movement for decentralization.</p>
-        </div>
-    </div>
-
-    <div class="mx_HomePage_intro">
-        <h2>Our rooms</h2>
-        <p>Please abide by the channels discussion categories and remain on topic to the specific category details listed.</p>
-        <p class="mx_HomePage_coc">Before posting please refer to our <a href="https://wiki.status.im/Code_of_conduct">Code of Conduct</a></p>
-    </div>
-
-
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/a.png">
-        <span class="mx_HomePage_name">#announcements</span>
-        <span class="mx_HomePage_desc">Company wide announcements.</span>
-        <a class="mx_HomePage_button" href="#/room/#announcements:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/i.png">
-        <span class="mx_HomePage_name">#introductions</span>
-        <span class="mx_HomePage_desc">Newcomer introductions.</span>
-        <a class="mx_HomePage_button" href="#/room/#introductions:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/g.png">
-        <span class="mx_HomePage_name">#general</span>
-        <span class="mx_HomePage_desc">General discussions of Status.</span>
-        <a class="mx_HomePage_button" href="#/room/#general:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/d.png">
-        <span class="mx_HomePage_name">#dev-status</span>
-        <span class="mx_HomePage_desc">Contributing to our codebase? Building a DApp or a chatbot? We're here to help.</span>
-        <a class="mx_HomePage_button" href="#/room/#dev-status:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/n.png">
-        <span class="mx_HomePage_name">#news-articles</span>
-        <span class="mx_HomePage_desc">Share news, articles related to Ethereum or projects you're excited about</span>
-        <a class="mx_HomePage_button" href="#/room/#news-articles:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_telegram">
-        <p>
-            Interested in market and cryptocurrency type discussions?
-        </p>
-        <a href="https://t.me/StatusNetworkChat">Join Telegram</a>
-    </div>
-</div>
--- a/res/themes/status/css/_StatusLogin.scss
+++ b/res/themes/status/css/_StatusLogin.scss
@@ -1,232 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// overrides for mx_Login* specific to Status.
-// Ideally this would be all Status prefixes for a Status specific version of the component
-// but given we're not doing Status as a dedicated 'skin' yet...
-
-.mx_StatusLogin {
-
-    width: 100%;
-    height: 100%;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    overflow: auto;
-
-    .mx_StatusLogin_brand {
-        position: absolute;
-        top: 30px;
-        left: 30px;
-    }
-
-    .mx_StatusLogin_content {
-        margin: auto;
-    }
-
-    .mx_StatusLogin_header {
-        text-align: center;
-        margin-top: 70px;
-        margin-bottom: 50px;
-    }
-
-    .mx_StatusLogin_header h1 {
-        font-size: 29px;
-        margin-bottom: 3px;
-    }
-
-    .mx_StatusLogin_subtitle {
-        font-size: 18px;
-    }
-
-    .mx_StatusLogin_subtitle a {
-        color: $riot-link-color;
-    }
-
-    .mx_StatusLogin_footer {
-        margin-top: 30px;
-        margin-bottom: 30px;
-        text-align: center;
-        font-size: 16px;
-        color: $footer-color;
-    }
-
-    .mx_StatusLogin_footer p {
-        margin-top: 0.5em;
-        margin-bottom: 0.5em;
-    }
-
-    .mx_StatusLogin_footer_cta {
-        color: $callout-color;
-        font-family: $header-font-family;
-        letter-spacing: 1px;
-        font-size: 13px;
-        text-transform: uppercase;
-        opacity: 1.0;
-        transition: opacity .2s ease;        
-    }
-
-    .mx_StatusLogin_footer_cta:hover {
-        opacity: 0.5;
-        text-decoration: none;
-    }
-
-    // overrides of .mx_Login
-
-    .mx_AuthPage_modal {
-        width: 330px;
-        min-height: initial;
-        padding-top: 40px;
-        padding-bottom: 20px;
-        padding-left: 10px;
-        padding-right: 10px;
-        border-radius: 8px;
-        color: $form-fg-color;
-        font-size: 16px;
-        line-height: 25px;
-        background-color: $form-bg-color;
-        background-image: url("$(status)/img/dot.svg");
-        box-shadow: 0px 5px 16px 0px rgba(25,12,46,0.16);
-        position: relative;
-        text-align: center;
-    }
-
-    .mx_AuthHeader_logo {
-        background-color: #fff;
-        width: 74px;
-        height: 74px;
-        border-radius: 37px;
-        box-shadow: 0px 5px 16px 0px rgba(0,0,0,0.2);
-        position: absolute;
-        top: -36px;
-        left: 50%;
-        margin-left: -36px;
-    }
-
-    .mx_AuthHeader_logo img {
-        width: 36px;
-        height: 36px;
-        padding: 19px;
-    }
-
-    .mx_AuthPage_modal h2 {
-        text-align: center;
-        color: $form-fg-color;
-        font-size: 25px;
-        margin-bottom: 24px;
-    }
-
-    .mx_Login_field {
-        width: 260px;
-        height: 27px;
-        padding: 8px 20px 10px 20px;
-        border-radius: 10px;
-        text-align: left;
-        border: 1px solid transparent;
-        background-color: $form-field-bg-color;
-        color: $form-field-fg-color;
-        font-weight: 300;
-        font-size: 15px;
-        margin-bottom: 14px;
-        transition: background-color .2s ease;
-    }
-
-    .mx_Login_field:focus {
-        border: 1px solid transparent;
-        background-color: $form-field-bg-hover-color;
-    }
-
-    .mx_Login_field::-webkit-input-placeholder {
-        font-family: $font-family;
-        color: $form-field-fg-color;
-        opacity: 0.6;
-    }
-
-    .mx_Login_field::-moz-placeholder {
-        font-family: $font-family;
-        color: $form-field-fg-color;
-        opacity: 0.6;        
-    }
-
-    .mx_Login_field_disabled {
-        opacity: 0.3;
-    }
-
-    .mx_Login_prompt {
-        font-size: 16px;
-    }
-
-    .mx_Login_submit {
-        min-width: 200px;
-        width: auto;
-        margin-top: 13px;
-        margin-bottom: 10px;
-    }
-
-    .mx_Login_submit:disabled {
-        opacity: 0.3;
-    }
-
-    .mx_Login_create {
-        margin-top: 10px;
-        display: block;
-        text-align: center;
-        width: 100%;
-        font-size: 15px;
-        opacity: 1.0;
-    }
-
-    .mx_Login_create:link,
-    .mx_Login_create:hover,
-    .mx_Login_create:visited
-    {
-        color: $form-fg-color;
-    }
-
-    .mx_Login_forgot {
-        display: block;
-        font-size: 15px;
-    }
-
-    .mx_Login_forgot:link,
-    .mx_Login_forgot:hover,
-    .mx_Login_forgot:visited
-    {
-        color: $form-fg-color;
-    }
-
-    .mx_Login_error {
-        color: $warning-color;
-        font-size: 18px;
-        width: 300px;
-        height: 44px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin: auto;
-        text-align: center;
-        margin-top: 12px;
-        margin-bottom: 16px;
-    }
-
-    .mx_Login_smallError {
-        font-size: 13px;
-        line-height: initial;
-    }
-
-}
--- a/res/themes/status/css/_fonts.scss
+++ b/res/themes/status/css/_fonts.scss
@@ -1,15 +0,0 @@
-@font-face {
-  font-family:PostGrotesk-Medium;
-  src:url('https://status.im/fonts/PostGrotesk-Medium.eot');
-  src:url('https://status.im/fonts/PostGrotesk-Medium.eot?#iefix') format("embedded-opentype"),url('https://status.im/fonts/PostGrotesk-Medium.woff') format("woff"),url('https://status.im/fonts/PostGrotesk-Medium.svg#PostGrotesk-Medium') format("svg");
-  font-weight: 400;
-  font-style: normal;
-}
-
-@font-face {
-  font-family:PostGrotesk-Book;
-  src:url('https://status.im/fonts/PostGrotesk-Book.eot');
-  src:url('https://status.im/fonts/PostGrotesk-Book.eot?#iefix') format("embedded-opentype"),url('https://status.im/fonts/PostGrotesk-Book.woff') format("woff"),url('https://status.im/fonts/PostGrotesk-Book.svg#PostGrotesk-Book') format("svg");
-  font-weight: 400;
-  font-style: normal;
-}
--- a/res/themes/status/css/_paths.scss
+++ b/res/themes/status/css/_paths.scss
@@ -1,5 +0,0 @@
-// Path from root SCSS file (such as `status.scss`) to `res` dir in `matrix-react-sdk`
-$res: ../../../../node_modules/matrix-react-sdk/res;
-
-// Path from root SCSS file (such as `status.scss`) to `status` dir in `riot-web`
-$status: ..;
--- a/res/themes/status/css/_status.scss
+++ b/res/themes/status/css/_status.scss
@@ -1,292 +0,0 @@
-// We deliberately prioritise Arial over Helvetica here due to diacritic problems (see _base.scss)
-// N.B. that the status.im website uses:
-// font-family:PostGrotesk-Book,-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif;
-// ...but can't be bothered to work out how the apple fonts & segoe interact, so keepingn it simple for now.
-
-$font-family: PostGrotesk-Book, Arial, Helvetica, Sans-Serif;
-
-// typical text (dark-on-white in light skin)
-$primary-fg-color: #70808D;
-$primary-bg-color: #EEF2F5;
-
-// ***** Start of Status theme specifics ******
-$header-color: #49555F;
-$header-font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-
-$footer-color: #8D99A4;
-
-$riot-link-color: #A26988;
-
-a {
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-h1,h2,h3,h4,h5 {
-    color: $header-color;
-    font-family: $header-font-family;
-    font-weight: 400 ! important;
-}
-
-$callout-color: #4360DF; // or #4957b8 from status.im homepage
-
-$form-bg-color: $callout-color;
-$form-fg-color: #ffffff;
-
-$form-field-bg-color: rgba(244, 242, 247, 0.12);
-$form-field-bg-hover-color: rgba(255, 255, 255, 0.2);
-$form-field-fg-color: #ffffff;
-
-// ***** End of Status theme specifics ******
-
-
-// used for dialog box text
-$light-fg-color: #747474;
-
-// used for focusing form controls
-$focus-bg-color: #dddddd;
-
-// button UI (white-on-green in light skin)
-$accent-fg-color: #ffffff;
-$accent-color: #6CC1F6;
-$accent-color-alt: $accent-color;
-$accent-color-50pct: #6CC1F67F;
-$accent-hover-color: #84cfff;
-
-$selection-fg-color: $primary-bg-color;
-
-$focus-brightness: 125%;
-
-// red warning colour
-$warning-color: #F69E98;
-$warning-bg-color: #DF2A8B;
-$info-bg-color: #2A9EDF;
-$mention-user-pill-bg-color: #ff0064;
-$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
-
-$group-alert-color: #774f7e;
-
-$preview-bar-bg-color: #f7f7f7;
-
-// left-panel style muted accent color
-$secondary-accent-color: #586C7B;
-$tertiary-accent-color: #DBEBF6;
-
-// stop the tinter trying to change the secondary accent color
-// by overriding the key to something untintable
-// XXX: this is a bit of a hack.
-#mx_theme_secondaryAccentColor {
-    color: #c0ffee ! important;
-}
-
-#mx_theme_tertiaryAccentColor {
-    color: #c0ffee ! important;
-}
-
-// used by RoomDirectory permissions
-$plinth-bg-color: $secondary-accent-color;
-
-// used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.5);
-
-// used by AddressSelector
-$selected-color: #eaf5f0;
-
-// selected for hoverover & selected event tiles
-$event-selected-color: #f7f7f7;
-
-// used for the hairline dividers in RoomView
-$primary-hairline-color: #e5e5e5;
-
-// used for the border of input text fields
-$input-border-color: #c9cfd4;
-$input-darker-bg-color: #c1c9d6;
-$input-darker-fg-color: #9fa9ba;
-
-$button-bg-color: #7ac9a1;
-$button-fg-color: white;
-// apart from login forms, which have stronger border
-$strong-input-border-color: #c7c7c7;
-
-// used for UserSettings EditableText
-$input-underline-color: rgba(151, 151, 151, 0.5);
-$input-fg-color: rgba(74, 74, 74, 0.9);
-
-// context menus
-$menu-border-color: rgba(187, 187, 187, 0.5);
-$menu-bg-color: #f6f6f6;
-$menu-selected-color: #f5f8fa;
-
-$avatar-initial-color: #ffffff;
-$avatar-bg-color: transparent;
-
-$h3-color: #3d3b39;
-
-$dialog-background-bg-color: #e9e9e9;
-$lightbox-background-bg-color: #000;
-
-$greyed-fg-color: #888;
-
-$neutral-badge-color: #dbdbdb;
-
-$preview-widget-bar-color: #ddd;
-$preview-widget-fg-color: $greyed-fg-color;
-
-$blockquote-bar-color: #ddd;
-$blockquote-fg-color: #777;
-
-$settings-grey-fg-color: #a2a2a2;
-
-$voip-decline-color: #f48080;
-$voip-accept-color: #80f480;
-
-$rte-bg-color: #e9e9e9;
-$rte-code-bg-color: rgba(0, 0, 0, 0.04);
-$rte-room-pill-color: #aaa;
-
-// ********************
-
-$roomtile-name-color: #ffffff;
-$roomtile-selected-bg-color: #465561;
-$roomtile-focused-bg-color: #6d8597;
-
-$username-variant1-color: #1e7ddc;
-$username-variant2-color: #a756a8;
-$username-variant3-color: #7ac9a1;
-$username-variant4-color: #f2809d;
-$username-variant5-color: #ffc666;
-$username-variant6-color: #76ddd7;
-$username-variant7-color: #45529b;
-$username-variant8-color: #bfd251;
-
-$roomsublist-background: rgba(0, 0, 0, 0.2);
-$roomsublist-label-fg-color: #ffffff;
-$roomsublist-label-bg-color: $secondary-accent-color;
-$roomsublist-chevron-color: #ffffff;
-
-$panel-divider-color: rgba(0, 0, 0, 0.2);
-
-// ********************
-
-$widget-menu-bar-bg-color: #f7f7f7;
-
-// ********************
-
-// event tile lifecycle
-$event-encrypting-color: #abddbc;
-$event-sending-color: #ddd;
-$event-notsent-color: #f44;
-
-// event redaction
-$event-redacted-fg-color: #e2e2e2;
-$event-redacted-border-color: #cccccc;
-
-// event timestamp
-$event-timestamp-color: #acacac;
-
-$edit-button-url: "$(res)/img/icon_context_message.svg";
-$copy-button-url: "$(res)/img/icon_copy_message.svg";
-
-// e2e
-$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
-$e2e-unverified-color: #e8bf37;
-$e2e-warning-color: #ba6363;
-
-/*** ImageView ***/
-$lightbox-bg-color: #454545;
-$lightbox-fg-color: #ffffff;
-$lightbox-border-color: #ffffff;
-
-// unused?
-$progressbar-color: #000;
-
-@define-mixin mx_DialogButton {
-    /* align images in buttons (eg spinners) */
-    vertical-align: middle;
-    border-radius: 8px;
-    border: 1px solid rgba(199, 206, 209, 0.12);
-    background-color: $accent-color;
-    font-size: 13px;
-    font-family: $header-font-family;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    color: $accent-fg-color;
-    cursor: pointer;
-    outline: none;
-    padding: 14px;
-    box-sizing: border-box;
-    padding-left: 1.5em;
-    padding-right: 1.5em;
-    display: inline-block;
-    transition: background-color .2s ease;
-}
-
-@define-mixin mx_DialogButton_hover {
-    background-color: $accent-hover-color;
-}
-
-@define-mixin mx_DialogButton_small {
-    @mixin mx_DialogButton;
-    height: auto;
-    padding-top: 7px;
-    padding-bottom: 7px;
-    padding-left: 1em;
-    padding-right: 1em;
-}
-
-.mx_RoomSubList_label {
-    font-size: 13px;
-    font-family: $header-font-family;
-    letter-spacing: 1px;
-}
-
-// FIXME: all these ! importants are horrid - we should instead go and define
-// variables or something.
-.mx_SearchBox_search {
-    color: #fff ! important;
-}
-
-.mx_SearchBox_search::-webkit-input-placeholder  {
-    color: rgba(255, 255, 255, 0.6) ! important;
-}
-
-.mx_SearchBox_search::-moz-placeholder  {
-    color: rgba(255, 255, 255, 0.6) ! important;
-}
-
-.mx_RoomList_emptySubListTip,
-.mx_RoomDropTarget {
-    font-size: 14px ! important;
-    border: 1.5px dashed rgba(0,0,0,0.2) ! important;
-    color: #fff ! important;
-    background-color: transparent ! important;
-    border-radius: 6px ! important;
-    margin-left: 6px ! important;
-    margin-right: 6px ! important;
-    margin-top: 8px ! important;
-    margin-bottom: 7px ! important;
-    padding: 8px ! important;
-}
-
-.mx_RoomDirectory_perm {
-    font-family: $header-font-family ! important;
-    background-color: #fff ! important;
-}
-
-.mx_RoomTile_badge,
-.mx_RoomSubList_badge {
-    height: 12px ! important;
-    padding-top: 1px ! important;
-    padding-bottom: 1px ! important;
-}
-
-.mx_RoomSubList_chevron {
-    top: 8px ! important;
-}
-
-.mx_MemberInfo .mx_RoomTile_name {
-    color: $primary-fg-color ! important;
-}
--- a/res/themes/status/css/status.scss
+++ b/res/themes/status/css/status.scss
@@ -1,6 +0,0 @@
-@import "_paths.scss";
-@import "_fonts.scss";
-@import "../../../../node_modules/matrix-react-sdk/res/themes/light/css/_base.scss";
-@import "_status.scss";
-@import "../../../../node_modules/matrix-react-sdk/res/css/_components.scss";
-@import "_StatusLogin.scss";
--- a/res/themes/status/fonts/README
+++ b/res/themes/status/fonts/README
@@ -1 +0,0 @@
-We link out to status.im for fonts, although ideally we'd put them here.
--- a/res/themes/status/img/a.png
+++ b/res/themes/status/img/a.png
--- a/res/themes/status/img/d.png
+++ b/res/themes/status/img/d.png
--- a/res/themes/status/img/dot.svg
+++ b/res/themes/status/img/dot.svg
@@ -1 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>Artboard</title><circle cx="10" cy="10" r="1" fill="#FFF" fill-rule="evenodd" opacity=".11"/></svg>
--- a/res/themes/status/img/g.png
+++ b/res/themes/status/img/g.png
--- a/res/themes/status/img/i.png
+++ b/res/themes/status/img/i.png
--- a/res/themes/status/img/logo.svg
+++ b/res/themes/status/img/logo.svg
--- a/res/themes/status/img/n.png
+++ b/res/themes/status/img/n.png
--- a/res/vector-icons/android-chrome-144x144.png
+++ b/res/vector-icons/android-chrome-144x144.png
--- a/res/vector-icons/android-chrome-192x192.png
+++ b/res/vector-icons/android-chrome-192x192.png
--- a/res/vector-icons/android-chrome-36x36.png
+++ b/res/vector-icons/android-chrome-36x36.png
--- a/res/vector-icons/android-chrome-48x48.png
+++ b/res/vector-icons/android-chrome-48x48.png
--- a/res/vector-icons/android-chrome-72x72.png
+++ b/res/vector-icons/android-chrome-72x72.png
--- a/res/vector-icons/android-chrome-96x96.png
+++ b/res/vector-icons/android-chrome-96x96.png
--- a/res/vector-icons/apple-touch-icon-114x114.png
+++ b/res/vector-icons/apple-touch-icon-114x114.png
--- a/res/vector-icons/apple-touch-icon-120x120.png
+++ b/res/vector-icons/apple-touch-icon-120x120.png
--- a/res/vector-icons/apple-touch-icon-144x144.png
+++ b/res/vector-icons/apple-touch-icon-144x144.png
--- a/res/vector-icons/apple-touch-icon-152x152.png
+++ b/res/vector-icons/apple-touch-icon-152x152.png
--- a/res/vector-icons/apple-touch-icon-180x180.png
+++ b/res/vector-icons/apple-touch-icon-180x180.png
--- a/res/vector-icons/apple-touch-icon-57x57.png
+++ b/res/vector-icons/apple-touch-icon-57x57.png
--- a/res/vector-icons/apple-touch-icon-60x60.png
+++ b/res/vector-icons/apple-touch-icon-60x60.png
--- a/res/vector-icons/apple-touch-icon-72x72.png
+++ b/res/vector-icons/apple-touch-icon-72x72.png
--- a/res/vector-icons/apple-touch-icon-76x76.png
+++ b/res/vector-icons/apple-touch-icon-76x76.png
--- a/res/vector-icons/apple-touch-icon-precomposed.png
+++ b/res/vector-icons/apple-touch-icon-precomposed.png
--- a/res/vector-icons/apple-touch-icon.png
+++ b/res/vector-icons/apple-touch-icon.png
--- a/res/vector-icons/favicon-16x16.png
+++ b/res/vector-icons/favicon-16x16.png
--- a/res/vector-icons/favicon-32x32.png
+++ b/res/vector-icons/favicon-32x32.png
--- a/res/vector-icons/favicon-96x96.png
+++ b/res/vector-icons/favicon-96x96.png
--- a/res/vector-icons/favicon.ico
+++ b/res/vector-icons/favicon.ico
--- a/res/vector-icons/mstile-144x144.png
+++ b/res/vector-icons/mstile-144x144.png
--- a/res/vector-icons/mstile-150x150.png
+++ b/res/vector-icons/mstile-150x150.png
--- a/res/vector-icons/mstile-310x150.png
+++ b/res/vector-icons/mstile-310x150.png
--- a/res/vector-icons/mstile-310x310.png
+++ b/res/vector-icons/mstile-310x310.png
--- a/res/vector-icons/mstile-70x70.png
+++ b/res/vector-icons/mstile-70x70.png
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -166,6 +166,11 @@ h1::after {
                <div class="mx_ButtonLabel">_t("Create Account")</div>
            </a>
        </div>
+        <!-- The comments below are meant to be used by Ansible as a quick way
+             to strip out the marked content when desired.
+             See https://github.com/vector-im/riot-web/issues/8622.
+             TODO: Convert to config option if possible. -->
+        <!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
        <div class="mx_ButtonRow">
            <div>
                <div class="mx_ButtonWrapperText">_t("Need help?")</div>
@@ -180,5 +185,6 @@ h1::after {
                </a>
            </div>
        </div>
+        <!-- END Ansible: Remove these lines when guest access is disabled -->
    </div>
 </div>
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# script to clean up the deployments made by redeploy.py for vectorwebdev and vectorwebexp
+set -e
+
+# currently live deployment (full path)
+live=`dirname $(readlink -f "$HOME/live")`
+
+# currently live bundle (just the name of the bundle)
+live_bundle=`grep 'script src="bundles' live/index.html | sed -e 's#.*bundles/##' -e 's#/.*##'`
+
+# clean up 'extracted': find things which are older than 7 days, exclude the current live one, and remove
+find $HOME/extracted -maxdepth 1 -type d -ctime +7 \! -path "$live" -exec rm -r {} \;
+
+# clean up 'bundles': ditto
+find $HOME/bundles -maxdepth 1 -type d -ctime +7 \! -name "$live_bundle" -exec rm -r {} \;
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -1,5 +1,7 @@
 #!/usr/bin/env node

+const loaderUtils = require("loader-utils");
+
 // copies the resources into the webapp directory.
 //

@@ -51,7 +53,6 @@ const INCLUDE_LANGS = [
 const COPY_LIST = [
    ["res/manifest.json", "webapp"],
    ["res/welcome.html", "webapp"],
-    ["res/home-status.html", "webapp"],
    ["res/welcome/**", "webapp/welcome"],
    ["res/themes/**", "webapp/themes"],
    ["res/vector-icons/**", "webapp/vector-icons"],
@@ -62,12 +63,6 @@ const COPY_LIST = [
    ["./config.json", "webapp", { directwatch: 1 }],
 ];

-INCLUDE_LANGS.forEach(function(l) {
-    COPY_LIST.push([
-        l.value, "webapp/i18n/", { lang: 1 },
-    ]);
-});
-
 const parseArgs = require('minimist');
 const Cpx = require('cpx');
 const chokidar = require('chokidar');
@@ -78,8 +73,8 @@ const argv = parseArgs(
    process.argv.slice(2), {}
 );

-var watch = argv.w;
-var verbose = argv.v;
+const watch = argv.w;
+const verbose = argv.v;

 function errCheck(err) {
    if (err) {
@@ -137,39 +132,11 @@ function next(i, err) {
                .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';
-
-            // XXX: Use a debounce because for some reason if we read the language
-            // file immediately after the FS event is received, the file contents
-            // appears empty. Possibly https://github.com/nodejs/node/issues/6112
-            let makeLangDebouncer;
-            const makeLang = () => {
-                if (makeLangDebouncer) {
-                    clearTimeout(makeLangDebouncer);
-                }
-                makeLangDebouncer = setTimeout(() => {
-                    genLangFile(source, dest);
-                }, 500);
-            };
-
-            [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);
    }
@@ -196,21 +163,28 @@ function genLangFile(lang, dest) {

    translations = weblateToCounterpart(translations);

-    fs.writeFileSync(dest + lang + '.json', JSON.stringify(translations, null, 4));
+    const json = JSON.stringify(translations, null, 4);
+    const jsonBuffer = Buffer.from(json);
+    const digest = loaderUtils.getHashDigest(jsonBuffer, null, null, 7);
+    const filename = `${lang}.${digest}.json`;
+
+    fs.writeFileSync(dest + filename, json);
    if (verbose) {
-        console.log("Generated language file: " + lang);
+        console.log("Generated language file: " + filename);
    }
+
+    return filename;
 }

-function genLangList() {
+function genLangList(langFileMap) {
    const languages = {};
    INCLUDE_LANGS.forEach(function(lang) {
        const normalizedLanguage = lang.value.toLowerCase().replace("_", "-");
        const languageParts = normalizedLanguage.split('-');
        if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
-            languages[languageParts[0]] = {'fileName': lang.value + '.json', 'label': lang.label};
+            languages[languageParts[0]] = {'fileName': langFileMap[lang.value], 'label': lang.label};
        } else {
-            languages[normalizedLanguage] = {'fileName': lang.value + '.json', 'label': lang.label};
+            languages[normalizedLanguage] = {'fileName': langFileMap[lang.value], 'label': lang.label};
        }
    });
    fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4), function(err) {
@@ -258,5 +232,50 @@ function weblateToCounterpart(inTrs) {
    return outTrs;
 }

-genLangList();
+/**
+watch the input files for a given language,
+regenerate the file, adding its content-hashed filename to langFileMap
+and regenerating languages.json with the new filename
+*/
+function watchLanguage(lang, dest, langFileMap) {
+    const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
+    const riotWebFile = 'src/i18n/strings/' + lang + '.json';
+
+    // XXX: Use a debounce because for some reason if we read the language
+    // file immediately after the FS event is received, the file contents
+    // appears empty. Possibly https://github.com/nodejs/node/issues/6112
+    let makeLangDebouncer;
+    const makeLang = () => {
+        if (makeLangDebouncer) {
+            clearTimeout(makeLangDebouncer);
+        }
+        makeLangDebouncer = setTimeout(() => {
+            const filename = genLangFile(lang, dest);
+            langFileMap[lang]=filename;
+            genLangList(langFileMap);
+        }, 500);
+    };
+
+    [reactSdkFile, riotWebFile].forEach(function(f) {
+        chokidar.watch(f)
+            .on('add', makeLang)
+            .on('change', makeLang)
+            .on('error', errCheck);
+    });
+}
+
+// language resources
+const I18N_DEST = "webapp/i18n/";
+const I18N_FILENAME_MAP = INCLUDE_LANGS.reduce((m, l) => {
+    const filename = genLangFile(l.value, I18N_DEST);
+    m[l.value] = filename;
+    return m;
+}, {});
+genLangList(I18N_FILENAME_MAP);
+
+if (watch) {
+    INCLUDE_LANGS.forEach(l => watchLanguage(l.value, I18N_DEST, I18N_FILENAME_MAP));
+}
+
+// non-language resources
 next(0);
--- a/scripts/electron-package.sh
+++ b/scripts/electron-package.sh
@@ -104,10 +104,12 @@ cp $distdir/*.dmg "$pubdir/install/macos/"

 # Windows installers go to the dist dir because they need signing
 mkdir -p "$pubdir/install/win32/ia32/"
-cp $distdir/win-ia32/*.exe "$projdir/electron_app/dist/unsigned/"
+mkdir -p "$projdir/electron_app/dist/unsigned/ia32/"
+cp $distdir/squirrel-windows-ia32/*.exe "$projdir/electron_app/dist/unsigned/ia32/"

 mkdir -p "$pubdir/install/win32/x64/"
-cp $distdir/win/*.exe "$projdir/electron_app/dist/unsigned/"
+mkdir -p "$projdir/electron_app/dist/unsigned/x64/"
+cp $distdir/squirrel-windows/*.exe "$projdir/electron_app/dist/unsigned/x64/"

 # Packages for auto-update
 mkdir -p "$pubdir/update/macos"
@@ -115,12 +117,12 @@ cp $distdir/*-mac.zip "$pubdir/update/macos/"
 echo "$vername" > "$pubdir/update/macos/latest"

 mkdir -p "$pubdir/update/win32/ia32/"
-cp $distdir/win-ia32/*.nupkg "$pubdir/update/win32/ia32/"
-cp $distdir/win-ia32/RELEASES "$pubdir/update/win32/ia32/"
+cp $distdir/squirrel-windows-ia32/*.nupkg "$pubdir/update/win32/ia32/"
+cp $distdir/squirrel-windows-ia32/RELEASES "$pubdir/update/win32/ia32/"

 mkdir -p "$pubdir/update/win32/x64/"
-cp $distdir/win/*.nupkg "$pubdir/update/win32/x64/"
-cp $distdir/win/RELEASES "$pubdir/update/win32/x64/"
+cp $distdir/squirrel-windows/*.nupkg "$pubdir/update/win32/x64/"
+cp $distdir/squirrel-windows/RELEASES "$pubdir/update/win32/x64/"

 # Move the debs to the main project dir's dist folder
 cp $distdir/*.deb "$projdir/electron_app/dist/"
--- a/scripts/make-icons.sh
+++ b/scripts/make-icons.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+#
+# Converts an svg logo into the various image resources required by
+# the various platforms deployments.
+#
+# On debian-based systems you need these deps:
+#   apt-get install xmlstarlet python3-cairosvg icnsutils

 if [ $# != 1 ]
 then
@@ -52,7 +58,23 @@ cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_256x256.png"
 cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_256x256@2x.png"
 cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png"
 cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/icon_512x512@2x.png"
-iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
+
+if [ -x "$(command -v iconutil)" ]; then
+  # available on macos
+  iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
+elif [ -x "$(command -v png2icns)" ]; then
+  # available on linux
+  # png2icns is more finicky about its input than iconutil
+  # 1. it doesn't support a 64x64 (aka 32x32@2x)
+  # 2. it doesn't like duplicates (128x128@2x == 256x256)
+  rm "$tmpdir/Riot.iconset/icon_128x128@2x.png"
+  rm "$tmpdir/Riot.iconset/icon_256x256@2x.png"
+  rm "$tmpdir/Riot.iconset/icon_16x16@2x.png"
+  rm "$tmpdir/Riot.iconset/icon_32x32@2x.png"
+  png2icns electron_app/build/icon.icns "$tmpdir"/Riot.iconset/*png
+else
+  echo "WARNING: Unsupported platform. Skipping icns build"
+fi

 cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png"
 cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png"
--- a/src/components/views/auth/VectorAuthFooter.js
+++ b/src/components/views/auth/VectorAuthFooter.js
@@ -19,7 +19,6 @@ limitations under the License.

 const React = require('react');
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore';

 module.exports = React.createClass({
    displayName: 'VectorAuthFooter',
@@ -28,10 +27,6 @@ module.exports = React.createClass({
    },

    render: function() {
-        // FIXME: replace this with a proper Status skin
-        // ...except then we wouldn't be able to switch to the Status theme at runtime.
-        if (SettingsStore.getValue("theme") === 'status') return <div />;
-
        return (
            <div className="mx_AuthFooter">
                <a href="https://medium.com/@RiotChat" target="_blank" rel="noopener">blog</a>
--- a/src/components/views/auth/VectorAuthHeaderLogo.js
+++ b/src/components/views/auth/VectorAuthHeaderLogo.js
@@ -19,23 +19,26 @@ limitations under the License.

 import React from 'react';
 import PropTypes from 'prop-types';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';

-const LOGO_URI = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+export default class VectorAuthHeaderLogo extends React.PureComponent {
+    static replaces = 'AuthHeaderLogo'

-module.exports = React.createClass({
-    displayName: 'VectorAuthHeaderLogo',
-    statics: {
-        replaces: 'AuthHeaderLogo',
-    },
-    propTypes: {
+    static propTypes = {
        icon: PropTypes.string,
-    },
+    }
+
+    render() {
+        const brandingConfig = SdkConfig.get().branding;
+        let logoUrl = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
+            logoUrl = brandingConfig.authHeaderLogoUrl;
+        }

-    render: function() {
        return (
            <div className="mx_AuthHeaderLogo">
-                <img src={LOGO_URI} alt="Riot" />
+                <img src={logoUrl} alt="Riot" />
            </div>
        );
-    },
-});
+    }
+}
--- a/src/components/views/auth/VectorAuthPage.js
+++ b/src/components/views/auth/VectorAuthPage.js
@@ -16,21 +16,24 @@ limitations under the License.

 'use strict';

-const React = require('react');
+import React from 'react';
 import sdk from 'matrix-react-sdk/lib/index';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';

-module.exports = React.createClass({
-    displayName: 'VectorAuthPage',
+export default class VectorAuthPage extends React.PureComponent {
+    static replaces = 'AuthPage'

-    statics: {
-        replaces: 'AuthPage',
-    },
-
-    render: function() {
+    render() {
        const AuthFooter = sdk.getComponent('auth.AuthFooter');

+        const brandingConfig = SdkConfig.get().branding;
+        let backgroundUrl = "themes/riot/img/backgrounds/valley.jpg";
+        if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
+            backgroundUrl = brandingConfig.welcomeBackgroundUrl;
+        }
+
        const pageStyle = {
-            background: 'center/cover fixed url(themes/riot/img/backgrounds/valley.jpg)',
+            background: `center/cover fixed url(${backgroundUrl})`,
        };

        const modalStyle = {
@@ -66,5 +69,5 @@ module.exports = React.createClass({
                <AuthFooter />
            </div>
        );
-    },
-});
+    }
+}
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -5,7 +5,7 @@
    "Riot Desktop on %(platformName)s": "الواجهة المكتبية لرايوت على %(platformName)s",
    "Unknown device": "جهاز مجهول",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s عبر %(browserName)s على %(osName)s",
-    "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن ( HTTPS) للسماح بمشاركة الشاشة",
+    "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن (HTTPS) للسماح بمشاركة الشاشة.",
    "Co-ordination for Riot translators": "التنسيق لمترجمين Riot",
    "powered by Matrix": "مشغل بواسطة Matrix",
    "Welcome to Riot.im": "مرحبا بك في Riot.im",
@@ -28,5 +28,10 @@
    "Running Matrix services": "تشغيل خدمات Matrix",
    "Community-run support for Synapse": "الدعم المجتمعي لـ Synapse",
    "Admin support for Dendrite": "الدعم الاداري لـDendrite",
-    "Announcements about Synapse releases": "إعلانات حول إصدارات Synaps"
+    "Announcements about Synapse releases": "إعلانات حول إصدارات Synaps",
+    "Create Account": "انشاء حساب",
+    "Need help?": "بحاجة إلى مساعدة؟",
+    "Explore rooms": "استكشف غرف المحادثات",
+    "Room Directory": "دليل غرف المحادثات",
+    "Sign In": "التسجيل"
 }
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -37,5 +37,10 @@
    "Dev chat for the Dendrite dev team": "Чат за разработващия екип на Dendrite",
    "Co-ordination for Riot translators": "Координация за преводачи на Riot",
    "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.": "Може да настроите и собствен сървър за самоличност, но така няма да можете да каните потребители по имейл адрес или да бъдете поканени посредством вашия имейл адрес.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това Ви позволява да използвате Riot със съществуващ Matrix акаунт принадлежащ към друг сървър."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това Ви позволява да използвате Riot със съществуващ Matrix акаунт принадлежащ към друг сървър.",
+    "Sign In": "Вход",
+    "Create Account": "Създай акаунт",
+    "Need help?": "Нужда от помощ?",
+    "Explore rooms": "Открий стаи",
+    "Room Directory": "Директория със стаи"
 }
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -35,5 +35,12 @@
    "Contributing code to Matrix and Riot": "Contribuir codi a Matrix i Riot",
    "Dev chat for the Riot/Web dev team": "Xat de l'equip de desenvolupadors Riot/Web",
    "Dev chat for the Dendrite dev team": "Xat de l'equip Dendrite per a desenvolupadors",
-    "Co-ordination for Riot translators": "Coordinació dels traductors del Riot"
+    "Co-ordination for Riot translators": "Coordinació dels traductors del Riot",
+    "Create Account": "Crea un compte",
+    "Need help?": "Necessiteu ajuda?",
+    "Explore rooms": "Exploreu les sales",
+    "Room Directory": "Directori de sales",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Podeu emprar les opcions personalitzades del servidor per iniciar la sessió en altres servidors de Matrix especificant un URL de servidor personal diferent. Això us permet emprar el Riot amb un compte de Matrix existent en un servidor personal diferent.",
+    "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.": "També podeu establir un servidor d'identitat personalitzat, però no podreu convidar usuaris o ser convidats vosaltres mateixos per adreça de correu electrònic.",
+    "Sign In": "Inicia la sessió"
 }
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -4,7 +4,7 @@
    "Riot is not supported on mobile web. Install the app?": "Riot není podporovaný na mobilním webu. Nainstalovat aplikaci?",
    "You need to be using HTTPS to place a screen-sharing call.": "Pro uskutečnění hovoru se sdílením obrazovky musíte používat HTTPS.",
    "Search the room directory": "Prohledat adresář místností",
-    "Chat with Riot Bot": "Chatujte s Riot Botem",
+    "Chat with Riot Bot": "Konverzovat s Riot Botem",
    "Get started with some tips from Riot Bot!": "Začněte s radami od Riot Bota!",
    "General discussion about Matrix and Riot": "Obecná diskuse o Matrixu a Riotu",
    "Discussion of all things Matrix!": "Diskuse o všem okolo Matrixu!",
@@ -35,5 +35,12 @@
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android a matrix-android-sdk chat",
    "Discussion of the Identity Service API": "Diskuze o API služby identity",
    "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.": "Přes vlastní serverové volby se můžete přihlásit k dalším Matrix serverům tak, že zadáte jinou adresu domovského serveru.<br/>Díky tomu můžete v Riotu používat Matrix účet z jiného domovského serveru.<br/><br/>Můžete nastavit i vlastní server identity, ale pak už nebudete moci zvát ani být zván/a skrze e-mailovou adresu.",
-    "Co-ordination for Riot translators": "Spolupráce pro překladatele Riot"
+    "Co-ordination for Riot translators": "Spolupráce pro překladatele Riot",
+    "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.": "Také je možné nastavit vlastní server identity, ale pak nebude možné pozvat uživatele pomocí emailové adresy ani být pozván pomocí emailové adresy.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Ve vlastních serverových volbách si můžete nastavit použití vlastního domovského serveru. To Vám umožní používat Riot s existujícím Matrix účtem na jiném serveru.",
+    "Sign In": "Přihlásit se",
+    "Create Account": "Vytvořit účet",
+    "Need help?": "Chcete pomoct?",
+    "Explore rooms": "Objevit místnosti",
+    "Room Directory": "Adresář místností"
 }
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -37,5 +37,10 @@
    "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.": "Die benutzerdefinierten Server-Einstellungen kannst du verwenden, um dich auf anderen Matrix-Servern anzumelden, indem du eine abweichende Heimserver-URL eingibst.<br/>Somit ist es möglich, Riot mit einem bereits bestehendem Matrix-Benutzerkonto auf einem anderen Heimserver zu verwenden.<br/><br/>Außerdem kannst du einen benutzerdefinierten Identitätsserver eingeben. Allerdings kannst du in diesem Fall Benutzer nicht mehr per E-Mail-Adresse einladen und auch selbst nicht mehr per E-Mail-Adresse eingeladen werden.",
    "Co-ordination for Riot translators": "Koordination für Riot-Übersetzer",
    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kannst die erweiterte Serveroption nutzen um dich an einem anderen Matrixserver anzumelden, indem du eine andere Heimserver-URL angibst. Dies erlaubt dir, Riot mit einem existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.",
-    "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.": "Du kannst auch einen anderen Identitätsserver setzen. Dieser hat einen anderen Wissensstand als der Standardserver, weswegen es beim Einladen oder Eingeladen werden mittels E-Mail-Adresse Probleme geben kann."
+    "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.": "Du kannst auch einen anderen Identitätsserver setzen. Dieser hat einen anderen Wissensstand als der Standardserver, weswegen es beim Einladen oder Eingeladen werden mittels E-Mail-Adresse Probleme geben kann.",
+    "Sign In": "Anmelden",
+    "Create Account": "Konto erstellen",
+    "Need help?": "Brauchst du Hilfe?",
+    "Explore rooms": "Räume erkunden",
+    "Room Directory": "Raumverzeichnis"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -35,5 +35,9 @@
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Αρκετά δωμάτια υπάρχουν ήδη στο Matrix, συνδεδεμένα σε υπάρχοντα δίκτυα (Slack, IRC, Gitter κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!",
    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix",
    "Co-ordination for Riot translators": "Συντονισμός για μεταφραστές του Riot",
-    "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.": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις διακομιστή για να συνδεθείτε σε άλλους διακομιστές Matrix δίνοντας ένα διαφορετικό URL διακομιστή.<br/>Αυτό σας επιτρέπει να χρησιμοποιήσετε το Riot με έναν υπάρχοντα λογαριασμό Matrix σε έναν διαφορετικό διακομιστή.<br/><br/>Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης αλλά δεν θα μπορείτε να προσκαλέσετε χρήστες ή να προσκληθείτε εσείς μέσω διεύθυνσης ηλεκτρονικού ταχυδρομίου."
+    "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.": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις διακομιστή για να συνδεθείτε σε άλλους διακομιστές Matrix δίνοντας ένα διαφορετικό URL διακομιστή.<br/>Αυτό σας επιτρέπει να χρησιμοποιήσετε το Riot με έναν υπάρχοντα λογαριασμό Matrix σε έναν διαφορετικό διακομιστή.<br/><br/>Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης αλλά δεν θα μπορείτε να προσκαλέσετε χρήστες ή να προσκληθείτε εσείς μέσω διεύθυνσης ηλεκτρονικού ταχυδρομίου.",
+    "Sign In": "Σύνδεση",
+    "Create Account": "Δημιουργία Λογαριασμού",
+    "Need help?": "Χρειάζεστε βοήθεια;",
+    "Room Directory": "Ευρετήριο δωματίων"
 }
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -10,7 +10,7 @@
    "Welcome to Riot.im": "Bienvenido a Riot.im",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas &amp;  colaboración con el poder de [matrix]",
    "Search the room directory": "Buscar en el directorio de salas",
-    "Chat with Riot Bot": "Conversar con el Bot de Riot",
+    "Chat with Riot Bot": "Hablar con Riot Bot",
    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos consejos de Riot Bot!",
    "General discussion about Matrix and Riot": "Discusión general sobre Matrix y Riot",
    "Discussion of all things Matrix!": "¡Discusión sobre todas las cosas de Matrix!",
@@ -35,5 +35,12 @@
    "Dev chat for the Dendrite dev team": "Conversaciones del equipo de desarrollo de Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muchas salas ya están disponibles en Matrix, enlazadas a redes existentes (Slack, IRC, Gitter, etc) o independientes. ¡Revisa el directorio!",
    "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.": "Puedes usar las opciones del servidor personalizado para acceder a otros servidores Matrix especificando su URL. <br/> Esto te permite usar Riot con una cuenta Matrix existente en un servidor doméstico distinto. <br/><br/>También puedes establecer un servidor de identidad personalizado pero no podrás invitar a otros usuarios usando su dirección de correo electrónico, y tampoco ser invitado por el tuyo.",
-    "Co-ordination for Riot translators": "Co-odinación de traductores de Riot"
+    "Co-ordination for Riot translators": "Co-odinación de traductores de Riot",
+    "Sign In": "Iniciar sesión",
+    "Create Account": "Crear cuenta",
+    "Need help?": "Ayuda?",
+    "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.": "También puedes definir un servidor de identidad personalizado,  pero no podrás invitar a usuarios o ser inivitado usando direcciones de correo.",
+    "Explore rooms": "Explorar salas",
+    "Room Directory": "Directorio de salas",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Puedes usar la opción de servidor personalizado para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente."
 }
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -35,5 +35,12 @@
    "Dev chat for the Dendrite dev team": "Dendrite garapen taldearen txata",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Badauden sareetara lotutako gela ugari daude Matrixen (Slack, IRC, Gitter eta abar), baita independienteak. Begiratu direktorioa!",
    "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.": "Zerbitzari pertsonalizatuaren aukerak erabili ditzakezu beste Matrix zerbitzarietan saioa hasteko, han beste hasiera-zerbitzari baten URLa sartuz.<br/>Horrela Riot aurretik duzun kontu batekin erabili dezakezu beste hasiera-zerbitzari batean.<br/><br/>Identitate-zerbitzari pertsonalizatu bat ezarri dezakezu ere, baina orduan ezin izango dituzu erabiltzaileak e-mail helbidea erabiliz gonbidatu, edo ezin izan izango zaituzte zu e-mail helbidea erabiliz gonbidatu.",
-    "Co-ordination for Riot translators": "Riot itzultzaileen koordinazioa"
+    "Co-ordination for Riot translators": "Riot itzultzaileen koordinazioa",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Zerbitzari pertsonalizatuaren aukera erabili dezakezu bestelako Matrix zerbitzari batera konektatzeko, bere URL-a adierazita. Honek Riot beste zerbitzari batean duzun Matrix kontuarekin erabiltzea ahalbidetzen dizu.",
+    "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.": "Identitate zerbitzari pertsonalizatu bat ere ezarri dezakezu, baina orduan ezin izango dituzu erabiltzaileak e-mail helbidearen bidez gonbidatu, edo ezin izango zaituzte e-mail helbidearen bidez zu gonbidatu.",
+    "Sign In": "Hasi saioa",
+    "Create Account": "Sortu kontua",
+    "Need help?": "Laguntza behar?",
+    "Explore rooms": "Arakatu gelak",
+    "Room Directory": "Gelen direktorioa"
 }
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -6,7 +6,7 @@
    "Custom Server Options": "Palvelinasetukset",
    "Riot Desktop on %(platformName)s": "Riot Desktop %(platformName)s",
    "You need to be using HTTPS to place a screen-sharing call.": "Sinun täytyy käyttää HTTPS -yhteyttä, jotta voit jakaa ruudun.",
-    "Chat with Riot Bot": "Keskustele Riot Botin kanssa",
+    "Chat with Riot Bot": "Keskustele Riot-botin kanssa",
    "Get started with some tips from Riot Bot!": "Aloita Riot Botin vinkkien avulla!",
    "General discussion about Matrix and Riot": "Matrix- ja Riot keskustelut",
    "Discussion of all things Matrix!": "Keskustelu kaikesta Matrixiin liittyvästä!",
@@ -34,5 +34,12 @@
    "Contributing code to Matrix and Riot": "Osallistu kehitystyöhön",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s %(osName)s",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Salattua ja vikasietoista viestintää Matrix -teknologialla",
-    "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.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.<br/>Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.<br/><br/>Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi."
+    "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.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.<br/>Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.<br/><br/>Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi muihin Matrix-palvelimiin. Tämä mahdollistaa Riotin käyttämisen toisella palvelimella olevalla Matrix-tunnuksella.",
+    "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.": "Voit myös määrittää toisen identiteettipalvelimen, mutta et voi kutsua muita käyttäjiä sähköpostin perusteella, eivätkä se voi kutsua sinua.",
+    "Sign In": "Kirjaudu sisään",
+    "Create Account": "Luo tunnus",
+    "Need help?": "Tarvitsetko apua?",
+    "Explore rooms": "Etsi huoneita",
+    "Room Directory": "Huonehakemisto"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -37,5 +37,10 @@
    "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.": "Vous pouvez utiliser les options de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en précisant un serveur d'accueil différent.<br/>Cela vous permet d'utiliser Riot avec un compte Matrix existant sur un autre serveur d'accueil.<br/><br/>Vous pouvez aussi renseigner un serveur d'identité personnalisé mais vous ne pourrez pas inviter d'utilisateurs avec leur adresse e-mail, ou être invité avec votre adresse e-mail.",
    "Co-ordination for Riot translators": "Coordination des traducteurs de Riot",
    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser les options de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en renseignant l'URL d'un autre serveur d'accueil. Cela vous permet d'utiliser Riot avec un compte Matrix existant sur un serveur d'accueil différent.",
-    "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.": "Vous pouvez aussi renseigner un serveur d'identité personnalisé, mais vous ne pourrez pas inviter d'utilisateurs avec leur adresse e-mail, ou être vous-même invité avec votre adresse e-mail."
+    "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.": "Vous pouvez aussi renseigner un serveur d'identité personnalisé, mais vous ne pourrez pas inviter d'utilisateurs avec leur adresse e-mail, ou être vous-même invité avec votre adresse e-mail.",
+    "Sign In": "Se connecter",
+    "Create Account": "Créer un compte",
+    "Need help?": "Besoin d'aide ?",
+    "Explore rooms": "Explorer les salons",
+    "Room Directory": "Répertoire de salons"
 }
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -35,5 +35,12 @@
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Xa existen multitude de salas en Matrix ben ligadas a redes existentes (Slack, IRC, Gitter etc) ou ben independentes. Busque no directorio!",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; sala de conversas matrix-android-sdk",
    "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.": "Pode utilizar as opcións persoais de servidor para conectarse a outros servidores Matrix indicando o enderezo URL dese servidor.</br>Isto permítelle utilizar Riot cunha conta Matrix existente en outro servidor.<br/><br/>Tamén pode empregar un servidor personalizado de identidade mais nese caso nin se poderán convidar a outros usuarios empregando os correo electrónicos nin tampouco eles o poderán convidar a vostede por correo.",
-    "Co-ordination for Riot translators": "Coordinación para tradutora/es de Riot"
+    "Co-ordination for Riot translators": "Coordinación para tradutora/es de Riot",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Podes usar as opcións de servidor personalizado para iniciar sesión en outros servidores Matrix  especificando unha dirección diferente de servidor doméstico. Con esto podes usar Riot cunha conta Matrix existente noutro servidor doméstico.",
+    "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.": "Tamén podes fixar un servidor de identidade, pero non poderás invitar a usuarios polo enderezo de correo, e tampouco que te inviten.",
+    "Sign In": "Entrar",
+    "Create Account": "Crear conta",
+    "Need help?": "¿Precisas axuda?",
+    "Explore rooms": "Explorar salas",
+    "Room Directory": "Directorio de salas"
 }
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -35,5 +35,12 @@
    "Contributing code to Matrix and Riot": "मैट्रिक्स और रायट में कोड योगदान करना",
    "Dev chat for the Riot/Web dev team": "रायट  / वेब डेव टीम के लिए डेवलपर चैट",
    "Dev chat for the Dendrite dev team": "डेन्ड्राइट देव टीम के लिए डेवलपर चैट",
-    "Co-ordination for Riot translators": "रायट अनुवादकों के लिए समन्वय"
+    "Co-ordination for Riot translators": "रायट अनुवादकों के लिए समन्वय",
+    "Sign In": "साइन करना",
+    "Create Account": "खाता बनाएं",
+    "Need help?": "मदद चाहिए?",
+    "Explore rooms": "रूम का अन्वेषण करें",
+    "Room Directory": "कक्ष निर्देशिका",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "आप एक अलग होमसर्वर URL निर्दिष्ट करके अन्य मैट्रिक्स सर्वर में साइन इन करने के लिए कस्टम सर्वर विकल्पों का उपयोग कर सकते हैं। यह आपको एक अलग होमसर्वर पर मौजूदा मैट्रिक्स खाते के साथ रायट का उपयोग करने की अनुमति देता है।",
+    "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.": "आप एक कस्टम पहचान सर्वर भी सेट कर सकते हैं, लेकिन आप उपयोगकर्ताओं को ईमेल पते से आमंत्रित नहीं कर पाएंगे, या स्वयं ईमेल पते से आमंत्रित नहीं किया जाएगा।"
 }
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -37,5 +37,10 @@
    "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.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott Matrix szerver URL-jével.<br/>Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.<br/><br/>Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.",
    "Co-ordination for Riot translators": "Koordináció Riot fordítók számára",
    "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.": "Más azonosítási szervert is használhatsz, de akkor nem tudsz másokat e-mail cím alapján meghívni és téged sem fognak tudni.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más Matrix szerverre való belépéshez, azzal, hogy megadod a Matrix szerver URL-jét. Ezzel a Riot-ot használhatod más Matrix szerveren lévő fiókkal."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más Matrix szerverre való belépéshez, azzal, hogy megadod a Matrix szerver URL-jét. Ezzel a Riot-ot használhatod más Matrix szerveren lévő fiókkal.",
+    "Sign In": "Bejelentkezés",
+    "Create Account": "Fiók készítés",
+    "Need help?": "Segíthetünk?",
+    "Explore rooms": "Szobák felfedezése",
+    "Room Directory": "Szoba lista"
 }
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1,20 +1,20 @@
 {
-    "Custom Server Options": "Tilpassede serveralternativer",
-    "powered by Matrix": "benytter seg av Matrix",
+    "Custom Server Options": "Server-instillinger",
+    "powered by Matrix": "Drevet av Matrix",
    "Riot is not supported on mobile web. Install the app?": "Riot er ikke støttet av mobil-nettlesere. Ønsker De å innstalere appen?",
-    "Riot Desktop on %(platformName)s": "Riot på skrivebordet er på %(platformName)s",
+    "Riot Desktop on %(platformName)s": "Riot Desktop på %(platformName)s",
    "Unknown device": "Ukjent enhet",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s på %(osName)s",
-    "You need to be using HTTPS to place a screen-sharing call.": "De er nødt til å benytte HTTPS for å kunne ha en samtale med skjermdeling.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Du er nødt til å bruke HTTPS for å ha en samtale med skjermdeling.",
    "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.": "De kan benytte brukerdefinerte server-innstillinger for å kunne logge Dem inn på andre Matrix-servere ved å spesifisere en annen hjemmeserver-adresse. <br/> Dette tillater Dem til å bruke Riot med en eksisterende Matrix-konto på en annen hjemmeserver. <br/><br/> De kan i tillegg definere en egen hjemmeserver-identitet, men De kan da ikke invitere andre brukere via email, og De kan heller ikke bli invitert via email selv.",
    "Dismiss": "Avvis",
-    "Welcome to Riot.im": "Velkommen skal De være til Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert nettprat &amp; sammabeid drevet av [matrix]",
-    "Search the room directory": "Søk i romutvalget",
+    "Welcome to Riot.im": "Velkommen til Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert chat &amp; sammabeid drevet av [matrix]",
+    "Search the room directory": "Søk i alle rom",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Allerede finnes det alskens rom i Matrix, sammenkoblet til eksisterende nettverk (Slack, IRC, Gitter osv.) eller selvstendig. Dersom De formoder, kan De kikke på utvalget!",
-    "Chat with Riot Bot": "Nettprat med Riot Bot",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kan bruke egendefinert tjener instillingen for å logge inn på andre Matrix tjenere ved å spesifisere enn annen hjemmetrjener URL. Dette lar deg bruke Riot med en eksisterende Matrix konto på en annen hjemmetjener.",
-    "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.": "Du kan også stille inn en egen idendtitetstjener, men du kommer ikke til å kunne invitere andre brukere med e-post, eller bli invitert med e-post selv.",
+    "Chat with Riot Bot": "Chat med Riot Bot",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kan bruke instillinger for «egendefinert tjener» til å logge inn på andre Matrix tjenere ved å spesifisere en annen URL. Dette lar deg bruke Riot med en eksisterende Matrix konto på en annen hjemmetjener.",
+    "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.": "Du kan også bruke din egen identitetstjener, men du kommer ikke til å kunne invitere andre brukere med e-post, eller bli invitert med e-post selv.",
    "Get started with some tips from Riot Bot!": "Kom i gang med noen tips fra Riot Bot!",
    "General discussion about Matrix and Riot": "Generelle diskusjoner om Matrix og Riot",
    "Discussion of all things Matrix!": "Diskusjoner om alt Matrix!",
@@ -25,5 +25,10 @@
    "Running Matrix services": "Kjør Matrix servicer",
    "Community-run support for Synapse": "Samfunnsholdt hjelpetjeneste for Synapse",
    "Admin support for Dendrite": "Administrator hjelp for Dendrite",
-    "Announcements about Synapse releases": "Kunngjøring om Synapse utgivelser"
+    "Announcements about Synapse releases": "Kunngjøring om Synapse utgivelser",
+    "Sign In": "Logg inn",
+    "Create Account": "Lag konto",
+    "Need help?": "Trenger du hjelp?",
+    "Room Directory": "Alle rom",
+    "Explore rooms": "Se alle rom"
 }
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -7,7 +7,7 @@
    "Dismiss": "Avvis",
    "powered by Matrix": "Matrixdriven",
    "Welcome to Riot.im": "Velkomen til Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert nettprat &amp; samarbeid driven av [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert nettprat &amp; samarbeid drive av [matrix]",
    "Search the room directory": "Søk i romutvalet",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Det finst allereie massevis av rom på Matrix, anten lenkja til nettverk som allereie finst (Slack, IRC, Gitter osv.) eller uavhengige. Tak ein titt på utvalet!",
    "Chat with Riot Bot": "Nettprat med Riot Bot",
@@ -35,5 +35,12 @@
    "Dev chat for the Dendrite dev team": "Utviklar-prat for Dendrite-utviklargruppa",
    "Co-ordination for Riot translators": "Samordning for Riot-omsetjare",
    "Custom Server Options": "Eigentenar-innstillingar",
-    "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.": "Du kan bruka eigentenarinnstillingar til å logga inn på andre Matrixtenarar ved å oppgje ein annan Heimtenar-URL. <br/>Dette gjer at du kan bruka Riot med ein Matrixbrukar som allereie finst på ein annan heimtenar.<br/><br/>Du kan òg setja ein eigen identitetstenar men du kjem i so fall ikkje til å kunna byda brukare inn med epost, eller å sjølv verta boden inn med epost."
+    "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.": "Du kan bruka eigentenarinnstillingar til å logga inn på andre Matrixtenarar ved å oppgje ein annan Heimtenar-URL. <br/>Dette gjer at du kan bruka Riot med ein Matrixbrukar som allereie finst på ein annan heimtenar.<br/><br/>Du kan òg setja ein eigen identitetstenar men du kjem i so fall ikkje til å kunna byda brukare inn med epost, eller å sjølv verta boden inn med epost.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kan nytta dei eigendefinerte tenarinstillingane for å logga inn på andre Matrix-tenarar ved å uppgje ein annan heimtenar-URL. Dette lèt deg bruka Riot med ein Matrix-konto som allereie finst på ein annan heimtenar.",
+    "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.": "Du kan òg velja ein eigendefinert identitetstenar, men då kjem du ikkje til å innvitere brukarar gjennom e-post, eller verta invitert med e-post sjølv.",
+    "Sign In": "Logg inn",
+    "Create Account": "Lag brukar",
+    "Need help?": "Treng du hjelp?",
+    "Explore rooms": "Vert kjend med romma",
+    "Room Directory": "Romutval"
 }
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -35,5 +35,9 @@
    "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix ma wiele, już działających pokoi, połączonych z istniejącymi sieciami, takimi jak Slack, IRC lub Gitter, a także wiele zupełnie niezależnych. Możesz przejrzeć je wszystkie w spisie pokoi!",
    "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.": "Możesz skorzystać z opcji niestandardowego serwera, aby zalogować się na inne serwery Matrix, podając inny adres URL serwera domowego.<br/>Pozwala to na używanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Możesz również ustawić niestandardowy serwer tożsamości, ale nie będziesz w stanie zapraszać użytkowników przez adres e-mail ani otrzymywać zaproszeń na adres e-mail.",
-    "Co-ordination for Riot translators": "Koordynacja tłumaczy Riot"
+    "Co-ordination for Riot translators": "Koordynacja tłumaczy Riot",
+    "Create Account": "Stwórz konto",
+    "Sign In": "Zaloguj",
+    "Need help?": "Potrzebujesz pomocy?",
+    "Room Directory": "Katalog pokojów"
 }
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -35,5 +35,12 @@
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muitas salas já existem no Matrix, algumas independentes, e outras relacionadas a redes existentes (tais como Slack, IRC, Gitter, entre outras). Dê uma olhada na lista de salas públicas!",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo oferecido por [matrix]",
    "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.": "Você pode usar as opções customizadas de servidor para conectar-se a outros servidores Matrix ao especificar uma outra URL de Servidor de Base (homeserver).<br/> Isso permite que você use o Riot com uma conta Matrix existente em outro servidor de base.<br/><br/>Você também pode definir um servidor de identidade customizado, mas neste caso você não poderá convidar outras pesoas por endereço de email, ou ser convidada/o pelo seu endereço de email.",
-    "Co-ordination for Riot translators": "Coordenação para tradutores Riot"
+    "Co-ordination for Riot translators": "Coordenação para tradutores Riot",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Você pode usar as opções personalizadas do servidor para entrar em outros servidores Matrix, especificando um URL diferente de homeserver. Isso permite que você use o Riot com uma conta Matrix existente em um homeserver diferente.",
+    "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.": "Você também pode definir um servidor de identidade personalizado, mas não poderá convidar usuários por endereço de e-mail nem ser convidado por endereço de e-mail.",
+    "Sign In": "Entrar",
+    "Create Account": "Criar Conta",
+    "Need help?": "Precisa de ajuda?",
+    "Explore rooms": "Explore as salas",
+    "Room Directory": "Diretório de salas"
 }
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -37,5 +37,10 @@
    "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.": "Вы можете войти на другой сервер Matrix, указав его URL-адрес.<br/>Это позволяет использовать Riot с учетной записью Matrix на другом сервере.<br/><br/>Кроме того, можно выбрать другой сервер идентификации, однако в таком случае вы не сможете приглашать пользователей или быть приглашенным по адресу электронной почты.",
    "Co-ordination for Riot translators": "Координационный чат для переводчиков Riot",
    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Вы можете изменить параметры для входа на другие Matrix серверы, указав другой URL.\nЭто позволит использовать Riot с учетной записью Matrix, существующей на другом сервере.",
-    "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.": "Также можно изменить сервер идентификации, но без возможности приглашать (или быть приглашённым) по адресу электронной почты."
+    "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.": "Также можно изменить сервер идентификации, но без возможности приглашать (или быть приглашённым) по адресу электронной почты.",
+    "Sign In": "Вход",
+    "Create Account": "Создать аккаунт",
+    "Need help?": "Помочь?",
+    "Room Directory": "Каталог комнат",
+    "Explore rooms": "Исследовать комнаты"
 }
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -37,5 +37,10 @@
    "Dev chat for the Dendrite dev team": "Fjalosje mbi zhvillimi, për ekipin e zhvilluesve të Dendrite-it",
    "Co-ordination for Riot translators": "Bashkërendim për përkthyes të Riot-it",
    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Mund të përdorni mundësitë mbi shërbyes vetjak, për të bërë hyrjen në shërbyes të tjerë Matrix, duke dhënë një tjetër URL shërbyesi Home. Kjo ju lejon ta përdorni këtë aplikacion në një tjetër shërbyes Home, me një llogari ekzistuese Matrix.",
-    "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.": "Mundeni edhe të caktoni një shërbyes vetjak identitetesh, por s’do të jeni në gjendje të ftoni përdorues përmes adresash email, ose të ftoheni ju vetë përmes adrese email."
+    "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.": "Mundeni edhe të caktoni një shërbyes vetjak identitetesh, por s’do të jeni në gjendje të ftoni përdorues përmes adresash email, ose të ftoheni ju vetë përmes adrese email.",
+    "Sign In": "Hyni",
+    "Create Account": "Krijoni Llogari",
+    "Need help?": "Ju duhet ndihmë?",
+    "Explore rooms": "Eksploroni dhoma",
+    "Room Directory": "Listë Dhomash"
 }
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -35,5 +35,12 @@
    "Contributing code to Matrix and Riot": "Додавање кода у Матрикс и Riot",
    "Dev chat for the Riot/Web dev team": "Програмерско ћаскање за Riot/веб програмерски тим",
    "Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим",
-    "Co-ordination for Riot translators": "Координација за Riot преводиоце"
+    "Co-ordination for Riot translators": "Координација за Riot преводиоце",
+    "Sign In": "Пријава",
+    "Create Account": "Направи налог",
+    "Need help?": "Потребна помоћ?",
+    "Explore rooms": "Истражи собе",
+    "Room Directory": "Фасцикла са собама",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Можете користити опције прилагођеног сервера да бисте се пријавили на друге Матрикс сервере тако што ћете навести другачију адресу кућног сервера. Ово вам омогућава да користите Riot са постојећим Матрикс налогом на другом кућном серверу.",
+    "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.": "Такође, можете подесити прилагођени сервер идентитета али у том случају нећете моћи да позивате кориснике преко мејла адресе или да сами будете позвани преко мејл адресе."
 }
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -37,5 +37,10 @@
    "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.": "Du kan använda anpassade serverinställningar för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL.<BR/>Du kan då använda Riot med ett befintligt Matrix-konto på en annan hemserver.<br/><br/>Du kan också ange en anpassad identitetsserver men kommer då inte kunna bjuda in användare med epostadress, eller själv bli inbjuden med epostadress.",
    "Co-ordination for Riot translators": "Koordination för Riot-översättare",
    "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.": "Du kan använda en egen identitetsserver, men då kan du inte bjuda in användare via epostadress eller själv bjudas in med din epostadress.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Under anpassade serverinställningar kan du logga in på andra Matrixservrar genom att ange en egen hemserveradress. På så sätt kan du använda Riot med ett Matrixkonto du redan har på en annan hemserver."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Under anpassade serverinställningar kan du logga in på andra Matrixservrar genom att ange en egen hemserveradress. På så sätt kan du använda Riot med ett Matrixkonto du redan har på en annan hemserver.",
+    "Sign In": "Logga in",
+    "Create Account": "Skapa konto",
+    "Need help?": "Behöver du hjälp?",
+    "Explore rooms": "Utforska rum",
+    "Room Directory": "Rumslista"
 }
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -1,5 +1,5 @@
 {
-    "Custom Server Options": "Нетипові параметри сервера",
+    "Custom Server Options": "Власні параметри сервера",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s через %(browserName)s на %(osName)s",
    "Dismiss": "Відхилити",
    "powered by Matrix": "працює на Matrix",
@@ -10,7 +10,7 @@
    "Welcome to Riot.im": "Ласкаво просимо до Riot.im",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентралізований, шифрований чат та засіб для співробітництва, що працює на [matrix]",
    "Search the room directory": "Шукати у каталозі кімнат",
-    "Chat with Riot Bot": "Розмовляти з Riot-ботом",
+    "Chat with Riot Bot": "Чат із Riot-ботом",
    "Get started with some tips from Riot Bot!": "Розпочніть за допомогою декількох підказок від Riot-боту!",
    "General discussion about Matrix and Riot": "Загальне обговорення Matrix та Riot",
    "Discussion of all things Matrix!": "Обговорення усіх деталей про Matrix!",
@@ -35,5 +35,12 @@
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "У мережі Matrix вже існує багато кімнат, що з'єднані як з існуючими мережами (Slack, IRC, Gitter тощо), так і незалежними. Подивіться у каталозі кімнат!",
    "Running Matrix services": "Запуск служби Matrix",
    "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.": "Ви можете використовувати параметри користувача сервера для входа на другі сервера Matrix, вказав другий URL-адресу домашнього сервера. <br/>Це дозволяє використовувати Riot з обліковим записом Matrix який існує на другому домашньому сервері.<br/><br/>Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному  використовуючи адресу електронної пошти.",
-    "Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot"
+    "Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Ви можете використати власні параметри сервера для входу в інші Matrix сервери, вказавши інший URL. Це дозволить використовувати Riot з наявним обліковим записом Matrix на іншому сервері.",
+    "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.": "Ви також можете встановити власний сервер ідентифікації, але Ви не зможете запрошувати користувачів або бути запрошеним за адресою електронної пошти.",
+    "Need help?": "Допомогти?",
+    "Sign In": "Вхід",
+    "Create Account": "Створити аккаунт",
+    "Explore rooms": "Дослідити кімнати",
+    "Room Directory": "Каталог кімнат"
 }
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -36,5 +36,10 @@
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix 中已有许多聊天室，连接到已有的网络（Slack、IRC 与 Gitter 等）或独立的网络，请查看目录！",
    "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.": "你可以修改主服务器 URL 以登录其他的 Matrix 服务器。<br/>这样，你就可以使用你在其他 Matrix 服务器上的账号。<br/><br/>你也可以修改身份认证服务器，但你可能因此无法使用电子邮件地址来邀请其他用户，或者被其他用户通过电子邮件邀请。",
    "Co-ordination for Riot translators": "Riot 翻译人员的合作讨论",
-    "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.": "您也可以自定义身份服务器，但是您将不能用电子邮箱地址邀请或被邀请。"
+    "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.": "您也可以自定义身份服务器，但是您将不能用电子邮箱地址邀请他人或被邀请。",
+    "Sign In": "登入",
+    "Create Account": "创建帐号",
+    "Need help?": "需要帮助？",
+    "Explore rooms": "探索房间",
+    "Room Directory": "房间目录"
 }
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -37,5 +37,10 @@
    "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.": "您可以使用自訂的伺服器選項，並指定不同的家伺服器 URL 來登入其他的 Matrix 伺服器。<br/>這讓您可以在不同的伺服器上以既有的 Matrix 帳號使用 Riot。<br/><br/>您也可以設定一個自訂的識別伺服器，但您可能無法透過電子郵件地址來邀請使用者，或是讓別人透過電子郵件邀請您。",
    "Co-ordination for Riot translators": "Riot 翻譯的協作",
    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "您可以以使用自訂伺服器選項指定不同的家伺服器 URL 以登入其他 Matrix 伺服器。這讓您可以在不同的家伺服器上使用既有的 Matrix 帳號登入 Riot。",
-    "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.": "您也可以設定自訂的身份識別伺服器，但您無法透過電子郵件地址邀請使用者，或是被邀請。"
+    "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.": "您也可以設定自訂的身份識別伺服器，但您無法透過電子郵件地址邀請使用者，或是被邀請。",
+    "Sign In": "登入",
+    "Create Account": "建立帳號",
+    "Need help?": "需要協助？",
+    "Explore rooms": "探索聊天室",
+    "Room Directory": "聊天室目錄"
 }
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -3,22 +3,22 @@
  <head>
    <meta charset="utf-8">
    <title>Riot</title>
-    <link rel="apple-touch-icon" sizes="57x57" href="vector-icons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="vector-icons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="vector-icons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="vector-icons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="vector-icons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="vector-icons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="vector-icons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="vector-icons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="vector-icons/apple-touch-icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="57x57" href="<%= require('../../res/vector-icons/apple-touch-icon-57x57.png') %>">
+    <link rel="apple-touch-icon" sizes="60x60" href="<%= require('../../res/vector-icons/apple-touch-icon-60x60.png') %>">
+    <link rel="apple-touch-icon" sizes="72x72" href="<%= require('../../res/vector-icons/apple-touch-icon-72x72.png') %>">
+    <link rel="apple-touch-icon" sizes="76x76" href="<%= require('../../res/vector-icons/apple-touch-icon-76x76.png') %>">
+    <link rel="apple-touch-icon" sizes="114x114" href="<%= require('../../res/vector-icons/apple-touch-icon-114x114.png') %>">
+    <link rel="apple-touch-icon" sizes="120x120" href="<%= require('../../res/vector-icons/apple-touch-icon-120x120.png') %>">
+    <link rel="apple-touch-icon" sizes="144x144" href="<%= require('../../res/vector-icons/apple-touch-icon-144x144.png') %>">
+    <link rel="apple-touch-icon" sizes="152x152" href="<%= require('../../res/vector-icons/apple-touch-icon-152x152.png') %>">
+    <link rel="apple-touch-icon" sizes="180x180" href="<%= require('../../res/vector-icons/apple-touch-icon-180x180.png') %>">
    <link rel="manifest" href="manifest.json">
-    <link rel="shortcut icon" href="vector-icons/favicon.ico">
+    <link rel="shortcut icon" href="<%= require('../../res/vector-icons/favicon.ico') %>">
    <meta name="apple-mobile-web-app-title" content="Riot">
    <meta name="application-name" content="Riot">
    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="vector-icons/mstile-144x144.png">
-    <meta name="msapplication-config" content="vector-icons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="<%= require('../../res/vector-icons/mstile-144x144.png') %>">
+    <meta name="msapplication-config" content="<%= require('../../res/vector-icons/browserconfig.xml') %>">
    <meta name="theme-color" content="#ffffff">
    <meta property="og:image" content="<%= htmlWebpackPlugin.options.vars.og_image_url %>" />
    <% for (var i=0; i < htmlWebpackPlugin.files.css.length; i++) {
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -281,7 +281,7 @@ async function loadApp() {

    // as quickly as we possibly can, set a default theme...
    let a;
-    const theme = "dharma";//SettingsStore.getValue("theme");
+    const theme = SettingsStore.getValue("theme");
    for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
        const href = a.getAttribute("href");
        if (!href) continue;
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -174,18 +174,30 @@ export default class ElectronPlatform extends VectorBasePlatform {
        return await this._ipcCall('getAppVersion');
    }

-    supportsAutoLaunch() {
+    supportsAutoLaunch(): boolean {
        return true;
    }

-    async getAutoLaunchEnabled() {
+    async getAutoLaunchEnabled(): boolean {
        return await this._ipcCall('getAutoLaunchEnabled');
    }

-    async setAutoLaunchEnabled(enabled) {
+    async setAutoLaunchEnabled(enabled: boolean): void {
        return await this._ipcCall('setAutoLaunchEnabled', enabled);
    }

+    supportsMinimizeToTray(): boolean {
+        return true;
+    }
+
+    async getMinimizeToTrayEnabled(): boolean {
+        return await this._ipcCall('getMinimizeToTrayEnabled');
+    }
+
+    async setMinimizeToTrayEnabled(enabled: boolean): void {
+        return await this._ipcCall('setMinimizeToTrayEnabled', enabled);
+    }
+
    async canSelfUpdate(): boolean {
        const feedUrl = await this._ipcCall('getUpdateFeedUrl');
        return Boolean(feedUrl);
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -88,19 +88,6 @@ export default class VectorBasePlatform extends BasePlatform {
        this._updateFavicon();
    }

-    supportsAutoLaunch() {
-        return false;
-    }
-
-    // XXX: Surely this should be a setting like any other?
-    async getAutoLaunchEnabled() {
-        return false;
-    }
-
-    async setAutoLaunchEnabled(enabled) {
-        throw new Error("Unimplemented");
-    }
-
    /**
     * Begin update polling, if applicable
     */
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -149,6 +149,9 @@ describe('loading:', function() {
        const config = Object.assign({
            default_hs_url: DEFAULT_HS_URL,
            default_is_url: DEFAULT_IS_URL,
+            embeddedPages: {
+                homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',
+            },
        }, opts.config || {});

        PlatformPeg.set(new WebPlatform());
@@ -222,8 +225,7 @@ describe('loading:', function() {
            }).done(done, done);
        });

-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('should follow the original link after successful login', function(done) {
+        it('should follow the original link after successful login', function(done) {
            loadApp({
                uriFragment: "#/room/!room:id",
            });
@@ -258,10 +260,9 @@ describe('loading:', function() {
                expect(localStorage.getItem('mx_hs_url')).toEqual(DEFAULT_HS_URL);
                expect(localStorage.getItem('mx_is_url')).toEqual(DEFAULT_IS_URL);
            }).done(done, done);
-        }); */
+        });

-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('should not register as a guest when using a #/login link', function() {
+        it('should not register as a guest when using a #/login link', function() {
            loadApp({
                uriFragment: "#/login",
            });
@@ -288,7 +289,7 @@ describe('loading:', function() {
                    matrixChat, sdk.getComponent('structures.EmbeddedPage'));
                expect(windowLocation.hash).toEqual("#/home");
            });
-        }); */
+        });
    });

    describe("MatrixClient rehydrated from stored credentials:", function() {
@@ -300,8 +301,7 @@ describe('loading:', function() {
            localStorage.setItem("mx_last_room_id", "!last_room:id");
        });

-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('shows the last known room by default', function() {
+        it('shows the last known room by default', function() {
            httpBackend.when('GET', '/pushrules').respond(200, {});
            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });

@@ -357,7 +357,7 @@ describe('loading:', function() {
                httpBackend.verifyNoOutstandingExpectation();
                expect(windowLocation.hash).toEqual("#/room/!room:id");
            }).done(done, done);
-        }); */
+        });

        describe('/#/login link:', function() {
            beforeEach(function() {
@@ -387,8 +387,7 @@ describe('loading:', function() {
                }
            });

-            // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-            /* it('shows the homepage after login', function() {
+            it('shows the homepage after login', function() {
                return completeLogin(matrixChat).then(() => {
                    // we should see a home page, even though we previously had
                    // a stored mx_last_room_id
@@ -396,13 +395,12 @@ describe('loading:', function() {
                        matrixChat, sdk.getComponent('structures.EmbeddedPage'));
                    expect(windowLocation.hash).toEqual("#/home");
                });
-            }); */
+            });
        });
    });

    describe('Guest auto-registration:', function() {
-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('shows a welcome page by default', function(done) {
+        it('shows a welcome page by default', function(done) {
            loadApp();

            Promise.delay(1).then(() => {
@@ -430,10 +428,9 @@ describe('loading:', function() {
                    matrixChat, sdk.getComponent('auth.Welcome'));
                expect(windowLocation.hash).toEqual("#/welcome");
            }).done(done, done);
-        }); */
+        });

-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('uses the default homeserver to register with', function(done) {
+        it('uses the default homeserver to register with', function(done) {
            loadApp();

            Promise.delay(1).then(() => {
@@ -457,15 +454,15 @@ describe('loading:', function() {
            }).then((req) => {
                expect(req.path).toStartWith(DEFAULT_HS_URL);

-                // once the sync completes, we should have a home page
+                // once the sync completes, we should have a welcome page
                httpBackend.verifyNoOutstandingExpectation();
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.EmbeddedPage'));
-                expect(windowLocation.hash).toEqual("#/home");
+                    matrixChat, sdk.getComponent('auth.Welcome'));
+                expect(windowLocation.hash).toEqual("#/welcome");
                expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL);
                expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL);
            }).done(done, done);
-        }); */
+        });

        it('shows a room view if we followed a room link', function(done) {
            loadApp({
@@ -534,15 +531,14 @@ describe('loading:', function() {
                });
            });

-            // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-            /* it('should give us a login page', function() {
+            it('should give us a login page', function() {
                expect(windowLocation.hash).toEqual("#/login");

                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
                    matrixChat, sdk.getComponent('structures.auth.Login'),
                );
-            }); */
+            });

            /*
            // ILAG renders this obsolete. I think.
@@ -684,8 +680,6 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {

    console.log(Date.now() + " Awaiting sync spinner: load complete.");

-    // state looks good, check the rendered output
-    assertAtSyncingSpinner(matrixChat);
    return Promise.resolve();
 }

--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,10 +16,8 @@ module.exports = {
        "mobileguide": "./src/vector/mobile_guide/index.js",

        // CSS themes
-        //"theme-light":  "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
-        //"theme-dark":   "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
-        "theme-dharma": "./node_modules/matrix-react-sdk/res/themes/dharma/css/dharma.scss",
-        //"theme-status": "./res/themes/status/css/status.scss",
+        "theme-light": "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
+        "theme-dark": "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
    },
    module: {
        rules: [
@@ -63,7 +61,17 @@ module.exports = {
                }),
            },
            {
-                test: /\.(gif|png|svg|ttf)$/,
+                // cache-bust languages.json file placed in
+                // riot-web/webapp/i18n during build by copy-res.js
+                test: /\.*languages.json$/,
+                type: "javascript/auto",
+                loader: 'file-loader',
+                options: {
+                    name: 'i18n/[name].[hash:7].[ext]',
+                },
+            },
+            {
+                test: /\.(gif|png|svg|ttf|xml|ico)$/,
                // Use a content-based hash in the name so that we can set a long cache
                // lifetime for assets while still delivering changes quickly.
                oneOf: [
@@ -143,6 +151,8 @@ module.exports = {

            // same goes for js-sdk
            "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
+
+            "$webapp": path.resolve('./webapp'),
        },
    },
    plugins: [
@@ -151,7 +161,6 @@ module.exports = {
                NODE_ENV: JSON.stringify(process.env.NODE_ENV),
            },
        }),
-
        new ExtractTextPlugin("bundles/[hash]/[name].css", {
            allChunks: true,
        }),
				`@@ -1 +0,0 @@`
				`We link out to status.im for fonts, although ideally we'd put them here.`
				`@@ -1 +0,0 @@`
				`<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>Artboard</title><circle cx="10" cy="10" r="1" fill="#FFF" fill-rule="evenodd" opacity=".11"/></svg>`