v0.17.3

Prepare changelog for v0.17.3
v0.17.3
2025-12-09 01:30:57 +00:00 · 2018-10-29 14:22:55 +00:00 · 2018-10-29 14:22:55 +00:00 · 2018-10-29 14:20:59 +00:00 · 2018-10-29 14:20:12 +00:00 · 2018-10-24 11:31:59 +01:00
59 changed files with 13463 additions and 4919 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ electron/pub
 /config.json.*
 /config.local*.json
 /src/component-index.js
+/.tmp
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,377 @@
+Changes in [0.17.3](https://github.com/vector-im/riot-web/releases/tag/v0.17.3) (2018-10-29)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.3-rc.1...v0.17.3)
+
+ * Fix for autocompleting text emoji from react-sdk v0.14.2
+
+Changes in [0.17.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.3-rc.1) (2018-10-24)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.2...v0.17.3-rc.1)
+
+ * Update from Weblate.
+   [\#7549](https://github.com/vector-im/riot-web/pull/7549)
+ * Don't set tags on notifications
+   [\#7518](https://github.com/vector-im/riot-web/pull/7518)
+ * Update to latest electron builder
+   [\#7498](https://github.com/vector-im/riot-web/pull/7498)
+ * Fix Tinter.setTheme to not fire using Firefox
+   [\#6831](https://github.com/vector-im/riot-web/pull/6831)
+
+Changes in [0.17.2](https://github.com/vector-im/riot-web/releases/tag/v0.17.2) (2018-10-19)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.1...v0.17.2)
+
+ * Update react-sdk version to "Apply the user's tint once the MatrixClientPeg is moderately ready"
+ * Electron: don't set tags on notifications
+   [\#7518](https://github.com/vector-im/riot-web/pull/7518)
+
+Changes in [0.17.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.1) (2018-10-18)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0...v0.17.1)
+
+ * Stop electron crashing
+   [\#7517](https://github.com/vector-im/riot-web/pull/7517)
+
+Changes in [0.17.0](https://github.com/vector-im/riot-web/releases/tag/v0.17.0) (2018-10-16)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0-rc.1...v0.17.0)
+
+ * Phased rollout of lazyloading
+   [\#7503](https://github.com/vector-im/riot-web/pull/7503)
+ * Update to latest electron builder
+   [\#7501](https://github.com/vector-im/riot-web/pull/7501)
+
+Changes in [0.17.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.0-rc.1) (2018-10-11)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.17.0-rc.1)
+
+ * Revert "also commit the lock file when bumping version as it is now
+   committed to the repo"
+   [\#7483](https://github.com/vector-im/riot-web/pull/7483)
+ * Update from Weblate.
+   [\#7478](https://github.com/vector-im/riot-web/pull/7478)
+ *  Fix riot-web Promise.defer warnings (#7409)
+   [\#7444](https://github.com/vector-im/riot-web/pull/7444)
+ * Use HTTPS cloning for riot-web too
+   [\#7459](https://github.com/vector-im/riot-web/pull/7459)
+ * Disable webpack-dev-server auto reload
+   [\#7463](https://github.com/vector-im/riot-web/pull/7463)
+ * Silence bluebird warnings
+   [\#7462](https://github.com/vector-im/riot-web/pull/7462)
+ * Fix reskindex on matrix-react-side not being called if using build script
+   [\#7443](https://github.com/vector-im/riot-web/pull/7443)
+ * Fix double-closed tags
+   [\#7454](https://github.com/vector-im/riot-web/pull/7454)
+ * Document how to turn off Piwik and bug reports (#6738)
+   [\#7435](https://github.com/vector-im/riot-web/pull/7435)
+ * also commit the lock file when bumping version as it is now committed to the
+   repo
+   [\#7429](https://github.com/vector-im/riot-web/pull/7429)
+ * Update a bunch of deps
+   [\#7393](https://github.com/vector-im/riot-web/pull/7393)
+ * Don't show mobile guide if deep linking
+   [\#7415](https://github.com/vector-im/riot-web/pull/7415)
+ * Don't show custom server bit on matrix.org
+   [\#7408](https://github.com/vector-im/riot-web/pull/7408)
+ * Update Webpack to version 4
+   [\#6620](https://github.com/vector-im/riot-web/pull/6620)
+ * Webpack4
+   [\#7387](https://github.com/vector-im/riot-web/pull/7387)
+
+Changes in [0.16.6](https://github.com/vector-im/riot-web/releases/tag/v0.16.6) (2018-10-08)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.16.6)
+
+ * Update to matrix-react-sdk v0.13.6
+
+Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5)
+
+ * Don't show mobile guide if deep linking
+   [\#7415](https://github.com/vector-im/riot-web/pull/7415)
+ * Don't show custom server bit on matrix.org
+   [\#7408](https://github.com/vector-im/riot-web/pull/7408)
+
+Changes in [0.16.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.5-rc.1) (2018-09-27)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4...v0.16.5-rc.1)
+
+ * Update from Weblate.
+   [\#7395](https://github.com/vector-im/riot-web/pull/7395)
+ * Reduce the number of terminals required to build riot-web to 1
+   [\#7355](https://github.com/vector-im/riot-web/pull/7355)
+ * Small typo in release notes v0.16.3
+   [\#7274](https://github.com/vector-im/riot-web/pull/7274)
+
+Changes in [0.16.4](https://github.com/vector-im/riot-web/releases/tag/v0.16.4) (2018-09-10)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4-rc.1...v0.16.4)
+
+ * No changes since rc.1
+
+Changes in [0.16.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.4-rc.1) (2018-09-07)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3...v0.16.4-rc.1)
+
+ * Update from Weblate.
+   [\#7296](https://github.com/vector-im/riot-web/pull/7296)
+ * Fix config not loading & mobileguide script being loaded in riot
+   [\#7288](https://github.com/vector-im/riot-web/pull/7288)
+ * Instructions for installing mobile apps
+   [\#7272](https://github.com/vector-im/riot-web/pull/7272)
+ * Tidy up index.js
+   [\#7265](https://github.com/vector-im/riot-web/pull/7265)
+
+Changes in [0.16.3](https://github.com/vector-im/riot-web/releases/tag/v0.16.3) (2018-09-03)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3-rc.2...v0.16.3)
+
+ * SECURITY FIX: This version (and release candidates) pull in an upstream security
+   fix from electron to fix CVE-2018-15685. Electron users should update as soon as
+   possible. Riot-web run outside of Electron is unaffected.
+
+Changes in [0.16.3-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.2) (2018-08-31)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3-rc.1...v0.16.3-rc.2)
+
+ * Update js-sdk to fix an exception causing the room list to become unresponsive.
+
+Changes in [0.16.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.1) (2018-08-30)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.2...v0.16.3-rc.1)
+
+ * Update from Weblate.
+   [\#7245](https://github.com/vector-im/riot-web/pull/7245)
+ * Revert "Remove package-lock.json for now"
+   [\#7128](https://github.com/vector-im/riot-web/pull/7128)
+ * Remove package-lock.json for now
+   [\#7115](https://github.com/vector-im/riot-web/pull/7115)
+
+Changes in [0.16.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.2) (2018-08-23)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.1...v0.16.2)
+
+ * Support new server notices format
+
+Changes in [0.16.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.1) (2018-08-20)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.1-rc.1...v0.16.1)
+
+ * No changes since rc.1
+
+Changes in [0.16.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.1-rc.1) (2018-08-16)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0...v0.16.1-rc.1)
+
+ * Update from Weblate.
+   [\#7178](https://github.com/vector-im/riot-web/pull/7178)
+ * CSS for MAU warning bar
+   [\#7152](https://github.com/vector-im/riot-web/pull/7152)
+ * CSS for user limit error
+   [\#7139](https://github.com/vector-im/riot-web/pull/7139)
+ * Unpin sanitize-html
+   [\#7132](https://github.com/vector-im/riot-web/pull/7132)
+ * Pin sanitize-html to 0.18.2
+   [\#7129](https://github.com/vector-im/riot-web/pull/7129)
+
+Changes in [0.16.0](https://github.com/vector-im/riot-web/releases/tag/v0.16.0) (2018-07-30)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.2...v0.16.0)
+
+* Update react-sdk version for bugfixes with Jitsi widgets and the new composer
+
+Changes in [0.16.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.2) (2018-07-24)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.1...v0.16.0-rc.2)
+
+ * Update to react-sdk rc.2 to remove Jitsi conference calling from labs
+
+Changes in [0.16.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.1) (2018-07-24)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7...v0.16.0-rc.1)
+
+ * Update from Weblate.
+   [\#7082](https://github.com/vector-im/riot-web/pull/7082)
+ * Sample config for jitsi integration URL
+   [\#7055](https://github.com/vector-im/riot-web/pull/7055)
+
+Changes in [0.15.7](https://github.com/vector-im/riot-web/releases/tag/v0.15.7) (2018-07-09)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.2...v0.15.7)
+
+ * No changes since rc.2
+
+Changes in [0.15.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.2) (2018-07-06)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.1...v0.15.7-rc.2)
+
+ * Update react-sdk and js-sdk
+
+Changes in [0.15.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.1) (2018-07-04)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6...v0.15.7-rc.1)
+
+ * add override for colour of room tile text within memberinfo (unreadable)
+   [\#6889](https://github.com/vector-im/riot-web/pull/6889)
+
+Changes in [0.15.6](https://github.com/vector-im/riot-web/releases/tag/v0.15.6) (2018-06-29)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.2...v0.15.6)
+
+ * Pull in bug fixes from react-sdk
+
+Changes in [0.15.6-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.2) (2018-06-22)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.1...v0.15.6-rc.2)
+
+ * Update to react-sdk rc.2 for fix to slash commands
+
+Changes in [0.15.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.1) (2018-06-21)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5...v0.15.6-rc.1)
+
+ * Update from Weblate.
+   [\#6915](https://github.com/vector-im/riot-web/pull/6915)
+ * [electron] Fix desktop app --hidden flag
+   [\#6805](https://github.com/vector-im/riot-web/pull/6805)
+
+Changes in [0.15.5](https://github.com/vector-im/riot-web/releases/tag/v0.15.5) (2018-06-12)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5-rc.1...v0.15.5)
+
+ * No changes since rc.1
+
+Changes in [0.15.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.5-rc.1) (2018-06-06)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.4...v0.15.5-rc.1)
+
+ * Update from Weblate.
+   [\#6846](https://github.com/vector-im/riot-web/pull/6846)
+
+Changes in [0.15.4](https://github.com/vector-im/riot-web/releases/tag/v0.15.4) (2018-05-25)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.4-rc.1...v0.15.4)
+
+ * Add cookie policy link to desktop app config
+
+Changes in [0.15.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.4-rc.1) (2018-05-24)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.3...v0.15.4-rc.1)
+
+ * Update from Weblate.
+   [\#6792](https://github.com/vector-im/riot-web/pull/6792)
+ * Hide URL options for e2e blob: URL images
+   [\#6765](https://github.com/vector-im/riot-web/pull/6765)
+ * Fix right click menu in electron
+   [\#6763](https://github.com/vector-im/riot-web/pull/6763)
+ * Update to electron 2.0.1
+   [\#6764](https://github.com/vector-im/riot-web/pull/6764)
+ * Add instructions for changing translated strings
+   [\#6528](https://github.com/vector-im/riot-web/pull/6528)
+
+Changes in [0.15.3](https://github.com/vector-im/riot-web/releases/tag/v0.15.3) (2018-05-18)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.2...v0.15.3)
+
+ * Fix right click menu in electron
+   [\#6763](https://github.com/vector-im/riot-web/pull/6763)
+ * Update to electron 2.0.1
+   [\#6764](https://github.com/vector-im/riot-web/pull/6764)
+ * Hide URL options for e2e blob: URL images
+   [\#6765](https://github.com/vector-im/riot-web/pull/6765)
+
+Changes in [0.15.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.2) (2018-05-17)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.1...v0.15.2)
+
+ * Update to matrix-react-sdk v0.12.5 to fix image size jumps
+
+Changes in [0.15.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.1) (2018-05-16)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0...v0.15.1)
+
+ * Fix package-lock.json which was causing errors building the Electron app
+ * Update Electron version
+
+Changes in [0.15.0](https://github.com/vector-im/riot-web/releases/tag/v0.15.0) (2018-05-16)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.6...v0.15.0)
+
+ * No changes since rc.6
+
+Changes in [0.15.0-rc.6](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.6) (2018-05-15)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.5...v0.15.0-rc.6)
+
+ * Update to matrix-react-sdk 0.12.4-rc.6
+
+Changes in [0.15.0-rc.5](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.5) (2018-05-15)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.4...v0.15.0-rc.5)
+
+ * Update to matrix-react-sdk 0.12.4-rc.5
+
+Changes in [0.15.0-rc.4](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.4) (2018-05-14)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.3...v0.15.0-rc.4)
+
+ * Update from Weblate.
+   [\#6726](https://github.com/vector-im/riot-web/pull/6726)
+ * Update to matrix-react-sdk 0.12.4-rc.4
+
+Changes in [0.15.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.3) (2018-05-11)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.2...v0.15.0-rc.3)
+
+ * Update to matrix-react-sdk 0.12.4-rc.3
+
+Changes in [0.15.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.2) (2018-05-09)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.1...v0.15.0-rc.2)
+
+ * Update to matrix-react-sdk 0.12.4-rc.2
+
+Changes in [0.15.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.1) (2018-05-09)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.3-rc.1...v0.15.0-rc.1)
+
+ * No changes since 0.14.3-rc.1
+
+Changes in [0.14.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.3-rc.1) (2018-05-09)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2...v0.14.3-rc.1)
+
+ * Update from Weblate.
+   [\#6688](https://github.com/vector-im/riot-web/pull/6688)
+ * Don't show presence on matrix.org
+   [\#6638](https://github.com/vector-im/riot-web/pull/6638)
+ * Enforce loading babel-polyfill first
+   [\#6625](https://github.com/vector-im/riot-web/pull/6625)
+ * Update hoek
+   [\#6624](https://github.com/vector-im/riot-web/pull/6624)
+ * Fix args in the release wrapper script
+   [\#6614](https://github.com/vector-im/riot-web/pull/6614)
+
+Changes in [0.14.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2) (2018-04-30)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.3...v0.14.2)
+
+ * No changes since rc.3
+
+Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3)
+
+ * Fix CSS dependency versions to be the same as those in react-sdk to fix
+   left panel header positions.
+
+Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2)
+
+ * Fix Download of attachments in e2e encrypted rooms in Firefox
+
 Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1)
@@ -60,7 +434,7 @@ Changes in [0.14.0-rc.6](https://github.com/vector-im/riot-web/releases/tag/v0.1
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0-rc.5...v0.14.0-rc.6)

- * Bump react-sdk to [rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6) 
+ * Bump react-sdk to [rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6)

 Changes in [0.14.0-rc.5](https://github.com/vector-im/riot-web/releases/tag/v0.14.0-rc.5) (2018-04-09)
 ======================================================================================================
--- a/README.md
+++ b/README.md
@@ -64,12 +64,13 @@ Building From Source
 Riot is a modular webapp built with modern ES6 and requires a npm build system
 to build.

-1. Install or update `node.js` so that your `node` is at least v6.3.0 (and `npm`
-   is at least v3.10.x).
+1. Install or update `node.js` so that your `node` is at least v8.12.0 (and `npm`
+   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. If you're using the `develop` branch, install the develop versions of the
-   dependencies, as the released ones will be too old:
+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:
   ```
   scripts/fetch-develop.deps.sh
   ```
@@ -89,13 +90,9 @@ to build.
   npm install
   npm run build
   ```
-   However, we recommend setting up a proper development environment (see "Setting
-   up a dev environment" below) if you want to run your own copy of the
-   `develop` branch, as it makes it much easier to keep these dependencies
-   up-to-date.  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.)
+   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).
@@ -137,7 +134,9 @@ For a good example, see https://riot.im/develop/config.json
 1. `integrations_rest_url`: URL to the REST interface for the integrations server.
 1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
 1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
-   https://github.com/matrix-org/rageshake server)
+   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
+   "Send Logs" within the application. Bug reports can be disabled by leaving the
+   `bug_report_endpoint_url` out of your config file.
 1. `roomDirectory`: config for the public room directory. This section is optional.
 1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
   down list. Optional.
@@ -150,11 +149,13 @@ For a good example, see https://riot.im/develop/config.json
   anything else since it is used to isolate the privileges of file attachments to this
   domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
   https://github.com/matrix-org/usercontent/blob/master/v1.html
-1. `piwik`: an object containing the following properties:
-    1. `url`: The URL of the Piwik instance to use for collecting Analytics
-    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the Analytics
-    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. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
+   option out of your config file. If you want to enable analytics, set `piwik` to be an object
+   containing the following properties:
+    1. `url`: The URL of the Piwik instance to use for collecting analytics
+    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
+    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. `teamServerConfig`, `teamTokenMap`, `referralBaseUrl`: an obsolete precursor to communities
   with referral tracking; please ignore it.
 1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
@@ -233,25 +234,17 @@ 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
 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
+
 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
 higher and lower level React components useful for building Matrix communication
 apps using React.

 After creating a new component you must run `npm run reskindex` to regenerate
-the `component-index.js` for the app (used in future for skinning)
-
-**However, as of July 2016 this layering abstraction is broken due to rapid
-development on Riot forcing `matrix-react-sdk` to move fast at the expense of
-maintaining a clear abstraction between the two.**  Hacking on Riot inevitably
-means hacking equally on `matrix-react-sdk`, and there are bits of
-`matrix-react-sdk` behaviour incorrectly residing in the `riot-web` project
-(e.g. matrix-react-sdk specific CSS), and a bunch of Riot specific behaviour
-in the `matrix-react-sdk` (grep for `vector` / `riot`).  This separation problem will be
-solved asap once development on Riot (and thus matrix-react-sdk) has
-stabilised.  Until then, the two projects should basically be considered as a
-single unit.  In particular, `matrix-react-sdk` issues are currently filed
-against `riot-web` in github.
+the `component-index.js` for the app (used in future for skinning).

 Please note that Riot is intended to run correctly without access to the public
 internet.  So please don't depend on resources (JS libs, CSS, images, fonts)
@@ -268,30 +261,29 @@ having to manually rebuild each time.

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

-1. `git clone git@github.com:matrix-org/matrix-js-sdk.git`
+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. `npm install source-map-loader`  # because webpack is made of fail (https://github.com/webpack/webpack/issues/1472)
 1. `popd`

 Then similarly with `matrix-react-sdk`:

-1. `git clone git@github.com:matrix-org/matrix-react-sdk.git`
+1. `git clone https://github.com/matrix-org/matrix-react-sdk.git`
 1. `pushd matrix-react-sdk`
 1. `git checkout develop`
-1. `npm install`
-1. `rm -r node_modules/matrix-js-sdk; ln -s ../../matrix-js-sdk node_modules/`
+1. `npm link ../matrix-js-sdk`
 1. `popd`

 Finally, build and start Riot itself:

-1. `git clone git@github.com:vector-im/riot-web.git`
+1. `git clone https://github.com/vector-im/riot-web.git`
 1. `cd riot-web`
 1. `git checkout develop`
 1. `npm install`
-1. `rm -r node_modules/matrix-js-sdk; ln -s ../../matrix-js-sdk node_modules/`
-1. `rm -r node_modules/matrix-react-sdk; ln -s ../../matrix-react-sdk node_modules/`
+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:
    ```
@@ -310,10 +302,8 @@ Finally, build and start Riot itself:
   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.

-When you make changes to `matrix-react-sdk` or `matrix-js-sdk`, you will need
-to run `npm run build` in the relevant directory. You can do this automatically
-by instead running `npm start` in the directory, to start a development builder
-which will watch for changes to the files and rebuild automatically.
+When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
+automatically picked up by webpack and built.

 If you add or remove any components from the Riot skin, you will need to rebuild
 the skin's index by running, `npm run reskindex`.
--- a/config.sample.json
+++ b/config.sample.json
@@ -8,6 +8,7 @@
    "brand": "Riot",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
+    "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "features": {
        "feature_groups": "labs",
--- a/docs/translating-dev.md
+++ b/docs/translating-dev.md
@@ -3,6 +3,8 @@
 ## Requirements

 - A working [Development Setup](../../#setting-up-a-dev-environment)
+  - Including up-to-date versions of matrix-react-sdk and matrix-js-sdk
+- Node 8 or later
 - Be able to understand English
 - Be able to understand the language you want to translate riot-web into

@@ -30,9 +32,15 @@ function getColorName(hex) {

 1. Check if the import ``import { _t } from 'matrix-react-sdk/lib/languageHandler';`` is present. If not add it to the other import statements. Also import `_td` if needed.
 1. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method). If the string is introduced at a point before the translation system has not yet been initialized, use `_td()` instead, and call `_t()` at the appropriate time.
- 1. Run `npm run i18n` to update ``src/i18n/strings/en_EN.json`` (if it fails because it can't find the script, your dev environment predates the script, so reinstall/link react-sdk with `npm link ../matrix-react-sdk`). If it segfaults, you may be on Node 6, so try a newer version of node.
+ 1. Run `npm run i18n` to update ``src/i18n/strings/en_EN.json``
 1. If you added a string with a plural, you can add other English plural variants to ``src/i18n/strings/en_EN.json`` (remeber to edit the one in the same project as the source file containing your new translation).

+## Editing existing strings
+
+1. Edit every occurrence of the string inside `_t()` and `_td()` in the JSX files.
+1. Run `npm run i18n` to update `src/i18n/strings/en_EN.json`. (Be sure to run this in the same project as the JSX files you just edited.)
+1. Run `npm run prunei18n` to remove the old string from `src/i18n/strings/*.json`.
+
 ## Adding variables inside a string.

 1. Extend your ``_t()`` call. Instead of ``_t(STRING)`` use ``_t(STRING, {})``
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "0.14.2-rc.1",
+  "version": "0.17.3",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "dependencies": {
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -18,6 +18,19 @@
    },
    "piwik": {
        "url": "https://piwik.riot.im/",
-        "siteId": 1
+        "siteId": 1,
+        "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy"
+    },
+    "phasedRollOut": {
+        "feature_lazyloading": {
+            "offset": 1539684000000,
+            "period": 604800000
+        }
+    },
+    "features": {
+        "feature_lazyloading": "enable"
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false
    }
 }
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -23,7 +23,7 @@ const checkSquirrelHooks = require('./squirrelhooks');
 if (checkSquirrelHooks()) return;

 const argv = require('minimist')(process.argv);
-const electron = require('electron');
+const {app, ipcMain, powerSaveBlocker, BrowserWindow, Menu} = require('electron');
 const AutoLaunch = require('auto-launch');

 const tray = require('./tray');
@@ -33,8 +33,8 @@ const updater = require('./updater');

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

-if (argv.profile) {
-    electron.app.setPath('userData', `${electron.app.getPath('userData')}-${argv.profile}`);
+if (argv['profile']) {
+    app.setPath('userData', `${app.getPath('userData')}-${argv['profile']}`);
 }

 let vectorConfig = {};
@@ -62,14 +62,14 @@ process.on('uncaughtException', function(error) {
 });

 let focusHandlerAttached = false;
-electron.ipcMain.on('setBadgeCount', function(ev, count) {
-    electron.app.setBadgeCount(count);
-    if (count === 0) {
+ipcMain.on('setBadgeCount', function(ev, count) {
+    app.setBadgeCount(count);
+    if (count === 0 && mainWindow) {
        mainWindow.flashFrame(false);
    }
 });

-electron.ipcMain.on('loudNotification', function() {
+ipcMain.on('loudNotification', function() {
    if (process.platform === 'win32' && mainWindow && !mainWindow.isFocused() && !focusHandlerAttached) {
        mainWindow.flashFrame(true);
        mainWindow.once('focus', () => {
@@ -81,16 +81,16 @@ electron.ipcMain.on('loudNotification', function() {
 });

 let powerSaveBlockerId;
-electron.ipcMain.on('app_onAction', function(ev, payload) {
+ipcMain.on('app_onAction', function(ev, payload) {
    switch (payload.action) {
        case 'call_state':
-            if (powerSaveBlockerId && electron.powerSaveBlocker.isStarted(powerSaveBlockerId)) {
+            if (powerSaveBlockerId && powerSaveBlocker.isStarted(powerSaveBlockerId)) {
                if (payload.state === 'ended') {
-                    electron.powerSaveBlocker.stop(powerSaveBlockerId);
+                    powerSaveBlocker.stop(powerSaveBlockerId);
                }
            } else {
                if (payload.state === 'connected') {
-                    powerSaveBlockerId = electron.powerSaveBlocker.start('prevent-display-sleep');
+                    powerSaveBlockerId = powerSaveBlocker.start('prevent-display-sleep');
                }
            }
            break;
@@ -98,9 +98,12 @@ electron.ipcMain.on('app_onAction', function(ev, payload) {
 });


-electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
+app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
+
+const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => {
+    // If other instance launched with --hidden then skip showing window
+    if (commandLine.includes('--hidden')) return;

-const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirectory) => {
    // Someone tried to run a second instance, we should focus our window.
    if (mainWindow) {
        if (!mainWindow.isVisible()) mainWindow.show();
@@ -111,7 +114,7 @@ const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirector

 if (shouldQuit) {
    console.log('Other instance detected: exiting');
-    electron.app.exit();
+    app.exit();
 }


@@ -136,7 +139,7 @@ const settings = {
    },
 };

-electron.ipcMain.on('settings_get', async function(ev) {
+ipcMain.on('settings_get', async function(ev) {
    const data = {};

    try {
@@ -145,34 +148,37 @@ electron.ipcMain.on('settings_get', async function(ev) {
        }));

        ev.sender.send('settings', data);
-    } catch(e) { console.error(e); }
+    } catch (e) {
+        console.error(e);
+    }
 });

-electron.ipcMain.on('settings_set', function(ev, key, value) {
+ipcMain.on('settings_set', function(ev, key, value) {
    console.log(key, value);
    if (settings[key] && settings[key].set) {
        settings[key].set(value);
    }
 });

-electron.app.on('ready', () => {
-
-    if (argv.devtools) {
+app.on('ready', () => {
+    if (argv['devtools']) {
        try {
-            const { default: installExtension, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer');
-            installExtension(REACT_DEVELOPER_TOOLS)
+            const { default: installExt, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer');
+            installExt(REACT_DEVELOPER_TOOLS)
                .then((name) => console.log(`Added Extension: ${name}`))
                .catch((err) => console.log('An error occurred: ', err));
-            installExtension(REACT_PERF)
+            installExt(REACT_PERF)
                .then((name) => console.log(`Added Extension: ${name}`))
                .catch((err) => console.log('An error occurred: ', err));
-        } catch(e) {console.log(e);}
+        } catch (e) {
+            console.log(e);
+        }
    }


-    if (vectorConfig.update_base_url) {
-        console.log(`Starting auto update with base URL: ${vectorConfig.update_base_url}`);
-        updater.start(vectorConfig.update_base_url);
+    if (vectorConfig['update_base_url']) {
+        console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`);
+        updater.start(vectorConfig['update_base_url']);
    } else {
        console.log('No update_base_url is defined: auto update is disabled');
    }
@@ -185,7 +191,7 @@ electron.app.on('ready', () => {
        defaultHeight: 768,
    });

-    mainWindow = global.mainWindow = new electron.BrowserWindow({
+    mainWindow = global.mainWindow = new BrowserWindow({
        icon: iconPath,
        show: false,
        autoHideMenuBar: true,
@@ -196,7 +202,7 @@ electron.app.on('ready', () => {
        height: mainWindowState.height,
    });
    mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
-    electron.Menu.setApplicationMenu(vectorMenu);
+    Menu.setApplicationMenu(vectorMenu);

    // explicitly hide because setApplicationMenu on Linux otherwise shows...
    // https://github.com/electron/electron/issues/9621
@@ -208,11 +214,16 @@ electron.app.on('ready', () => {
        brand: vectorConfig.brand || 'Riot',
    });

-    if (!argv.hidden) {
-        mainWindow.once('ready-to-show', () => {
+    mainWindow.once('ready-to-show', () => {
+        mainWindowState.manage(mainWindow);
+
+        if (!argv['hidden']) {
            mainWindow.show();
-        });
-    }
+        } else {
+            // hide here explicitly because window manage above sometimes shows it
+            mainWindow.hide();
+        }
+    });

    mainWindow.on('closed', () => {
        mainWindow = global.mainWindow = null;
@@ -240,18 +251,17 @@ electron.app.on('ready', () => {
    }

    webContentsHandler(mainWindow.webContents);
-    mainWindowState.manage(mainWindow);
 });

-electron.app.on('window-all-closed', () => {
-    electron.app.quit();
+app.on('window-all-closed', () => {
+    app.quit();
 });

-electron.app.on('activate', () => {
+app.on('activate', () => {
    mainWindow.show();
 });

-electron.app.on('before-quit', () => {
+app.on('before-quit', () => {
    global.appQuitting = true;
    if (mainWindow) {
        mainWindow.webContents.send('before-quit');
@@ -262,4 +272,4 @@ electron.app.on('before-quit', () => {
 // installer uses for the shortcut icon.
 // This makes notifications work on windows 8.1 (and is
 // a noop on other platforms).
-electron.app.setAppUserModelId('com.squirrel.riot-web.Riot');
+app.setAppUserModelId('com.squirrel.riot-web.Riot');
--- a/electron_app/src/webcontents-handler.js
+++ b/electron_app/src/webcontents-handler.js
@@ -35,12 +35,15 @@ function onLinkContextMenu(ev, params) {
    const url = params.linkURL || params.srcURL;

    const popupMenu = new Menu();
-    popupMenu.append(new MenuItem({
-        label: url,
-        click() {
-            safeOpenURL(url);
-        },
-    }));
+    // No point trying to open blob: URLs in an external browser: it ain't gonna work.
+    if (!url.startsWith('blob:')) {
+        popupMenu.append(new MenuItem({
+            label: url,
+            click() {
+                safeOpenURL(url);
+            },
+        }));
+    }

    if (params.mediaType && params.mediaType === 'image' && !url.startsWith('file://')) {
        popupMenu.append(new MenuItem({
@@ -55,13 +58,17 @@ function onLinkContextMenu(ev, params) {
        }));
    }

-    popupMenu.append(new MenuItem({
-        label: 'Copy Link Address',
-        click() {
-            clipboard.writeText(url);
-        },
-    }));
-    popupMenu.popup();
+    // No point offerring to copy a blob: URL either
+    if (!url.startsWith('blob:')) {
+        popupMenu.append(new MenuItem({
+            label: 'Copy Link Address',
+            click() {
+                clipboard.writeText(url);
+            },
+        }));
+    }
+    // popup() requires an options object even for no options
+    popupMenu.popup({});
    ev.preventDefault();
 }

@@ -88,7 +95,8 @@ function onSelectedContextMenu(ev, params) {
    const items = _CutCopyPasteSelectContextMenus(params);
    const popupMenu = Menu.buildFromTemplate(items);

-    popupMenu.popup();
+    // popup() requires an options object even for no options
+    popupMenu.popup({});
    ev.preventDefault();
 }

@@ -101,7 +109,8 @@ function onEditableContextMenu(ev, params) {

    const popupMenu = Menu.buildFromTemplate(items);

-    popupMenu.popup();
+    // popup() requires an options object even for no options
+    popupMenu.popup({});
    ev.preventDefault();
 }

--- a/karma.conf.js
+++ b/karma.conf.js
@@ -32,9 +32,12 @@ const olm_entry = webpack_config.entry['olm'];
 // 'preprocessors' config below)
 delete webpack_config['entry'];

+// make sure we're flagged as development to avoid wasting time optimising
+webpack_config.mode = 'development';
+
 // add ./test as a search path for js
-webpack_config.module.loaders.unshift({
-    test: /\.js$/, loader: "babel",
+webpack_config.module.rules.unshift({
+    test: /\.js$/, use: "babel-loader",
    include: [path.resolve('./src'), path.resolve('./test')],
 });

@@ -46,8 +49,9 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
 // ?
 webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';

-webpack_config.resolve.root = [
+webpack_config.resolve.modules = [
    path.resolve('./test'),
+    "node_modules"
 ];

 webpack_config.devtool = 'inline-source-map';
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
-  "version": "0.14.2-rc.1",
+  "version": "0.17.3",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -33,19 +33,25 @@
    "build:res": "node scripts/copy-res.js",
    "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
    "build:compile": "npm run reskindex && babel --source-maps -d lib src",
-    "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail",
-    "build:bundle:dev": "webpack --optimize-occurence-order --progress --bail",
+    "build:bundle": "cross-env NODE_ENV=production webpack-cli -p --progress --bail --mode production",
+    "build:bundle:dev": "webpack-cli --progress --bail --mode development",
    "build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
-    "build": "npm run reskindex && npm run build:res && npm run build:bundle",
-    "build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
+    "build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run build",
+    "build:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:init",
+    "build": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle",
+    "build:dev": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle:dev",
    "dist": "scripts/package.sh",
    "install:electron": "install-app-deps",
    "electron": "npm run install:electron && electron .",
    "start:res": "node scripts/copy-res.js -w",
-    "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-file=bundles/_dev_/[name].js -w --progress",
+    "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development",
    "start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress",
-    "start": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js\"",
-    "start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
+    "start:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:watch",
+    "start:js-sdk:prod": "cross-env NODE_ENV=production node scripts/npm-sub.js matrix-js-sdk run start:watch",
+    "start:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run start:all",
+    "start:react-sdk:prod": "cross-env NODE_ENV=production node scripts/npm-sub.js matrix-react-sdk run start:all",
+    "start": "npm run build:js-sdk && npm run build:react-sdk && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n js-sdk,react-sdk,reskindex,res,riot-js \"npm run start:js-sdk\" \"npm run start:react-sdk\" \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js\"",
+    "start:prod": "npm run build:js-sdk && npm run build:react-sdk && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n js-sdk,react-sdk,reskindex,res,riot-js \"npm run start:js-sdk:prod\" \"npm run start:react-sdk:prod\" \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
    "lint": "eslint src/",
    "lintall": "eslint src/ test/",
    "clean": "rimraf lib webapp electron_app/dist",
@@ -54,101 +60,97 @@
    "test-multi": "karma start"
  },
  "dependencies": {
-    "babel-polyfill": "^6.5.0",
-    "babel-runtime": "^6.11.6",
-    "bluebird": "^3.5.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-runtime": "^6.26.0",
+    "bluebird": "^3.5.2",
    "browser-request": "^0.3.3",
-    "draft-js": "^0.10.5",
-    "extract-text-webpack-plugin": "^0.9.1",
+    "draft-js": "^0.11.0-alpha",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
    "favico.js": "^0.3.10",
-    "gemini-scrollbar": "^1.5.3",
+    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
    "gfm.css": "^1.1.2",
-    "highlight.js": "^9.12.0",
-    "matrix-js-sdk": "0.10.2-rc.1",
-    "matrix-react-sdk": "0.12.3-rc.2",
-    "modernizr": "^3.1.0",
-    "prop-types": "^15.5.10",
+    "highlight.js": "^9.13.0",
+    "matrix-js-sdk": "0.12.1",
+    "matrix-react-sdk": "0.14.2",
+    "modernizr": "^3.6.0",
+    "prop-types": "^15.6.2",
    "react": "^15.6.0",
    "react-dom": "^15.6.0",
-    "sanitize-html": "^1.11.1",
-    "ua-parser-js": "^0.7.10",
+    "sanitize-html": "^1.19.1",
+    "ua-parser-js": "^0.7.18",
    "url": "^0.11.0"
  },
  "devDependencies": {
    "autoprefixer": "^6.6.0",
-    "babel-cli": "^6.5.2",
-    "babel-core": "^6.14.0",
-    "babel-eslint": "^6.1.0",
-    "babel-loader": "^6.2.5",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^6.1.2",
+    "babel-loader": "^7.1.5",
    "babel-plugin-add-module-exports": "^0.2.1",
    "babel-plugin-transform-async-to-bluebird": "^1.1.1",
-    "babel-plugin-transform-class-properties": "^6.16.0",
-    "babel-plugin-transform-object-rest-spread": "^6.16.0",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-preset-es2015": "^6.16.0",
-    "babel-preset-es2016": "^6.16.0",
-    "babel-preset-es2017": "^6.16.0",
-    "babel-preset-react": "^6.16.0",
-    "babel-preset-stage-2": "^6.17.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-es2016": "^6.24.1",
+    "babel-preset-es2017": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
    "chokidar": "^1.6.1",
+    "concurrently": "^4.0.1",
    "cpx": "^1.3.2",
    "cross-env": "^4.0.0",
-    "css-raw-loader": "^0.1.1",
-    "electron-builder": "^11.2.4",
-    "electron-builder-squirrel-windows": "^11.2.1",
-    "electron-devtools-installer": "^2.2.0",
+    "electron-builder": "^20.28.4",
+    "electron-builder-squirrel-windows": "^11.6.1",
+    "electron-devtools-installer": "^2.2.4",
    "emojione": "^2.2.7",
-    "eslint": "^3.14.0",
+    "eslint": "^5.7.0",
    "eslint-config-google": "^0.7.1",
-    "eslint-plugin-babel": "^4.1.1",
-    "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-babel": "^4.1.2",
+    "eslint-plugin-flowtype": "^2.50.3",
+    "eslint-plugin-react": "^7.11.1",
    "expect": "^1.16.0",
    "fs-extra": "^0.30.0",
-    "html-webpack-plugin": "^2.24.0",
+    "html-webpack-plugin": "^3.2.0",
    "json-loader": "^0.5.3",
-    "karma": "^1.7.0",
+    "karma": "^3.0.0",
    "karma-chrome-launcher": "^0.2.3",
-    "karma-cli": "^0.1.2",
-    "karma-junit-reporter": "^0.4.1",
+    "karma-cli": "^1.0.1",
+    "karma-junit-reporter": "^2.0.0",
    "karma-logcapture-reporter": "0.0.1",
-    "karma-mocha": "^0.2.2",
+    "karma-mocha": "^1.3.0",
    "karma-sourcemap-loader": "^0.3.7",
    "karma-spec-reporter": "0.0.31",
-    "karma-summary-reporter": "^1.3.3",
-    "karma-webpack": "^1.7.0",
+    "karma-summary-reporter": "^1.5.1",
+    "karma-webpack": "4.0.0-beta.0",
    "matrix-mock-request": "^1.2.0",
    "matrix-react-test-utils": "^0.2.0",
    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
-    "mocha": "^2.4.5",
-    "parallelshell": "^3.0.2",
+    "mocha": "^5.2.0",
    "postcss-extend": "^1.0.5",
-    "postcss-import": "^9.0.0",
-    "postcss-loader": "^1.2.2",
-    "postcss-mixins": "^5.4.1",
-    "postcss-nested": "^1.0.0",
-    "postcss-scss": "^0.4.0",
-    "postcss-simple-vars": "^3.0.0",
+    "postcss-import": "^11.1.0",
+    "postcss-loader": "^2.1.6",
+    "postcss-mixins": "^6.2.0",
+    "postcss-nested": "^3.0.0",
+    "postcss-scss": "^1.0.6",
+    "postcss-simple-vars": "^4.1.0",
    "postcss-strip-inline-comments": "^0.1.5",
+    "raw-loader": "^0.5.1",
    "react-addons-perf": "^15.4.0",
    "react-addons-test-utils": "^15.6.0",
    "rimraf": "^2.4.3",
-    "source-map-loader": "^0.2.3",
-    "webpack": "^1.12.14",
-    "webpack-dev-server": "^1.16.2"
+    "source-map-loader": "^0.2.4",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.9"
  },
  "optionalDependencies": {
    "olm": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz"
  },
  "build": {
    "appId": "im.riot.app",
-    "category": "Network",
-    "electronVersion": "1.8.4",
-    "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
-    "asar": false,
-    "dereference": true,
-    "//files": "We bundle everything, so we only need to include webapp/",
+    "electronVersion": "3.0.5",
    "files": [
      "node_modules/**",
      "src/**",
@@ -165,8 +167,13 @@
        "StartupWMClass": "riot"
      }
    },
+    "mac": {
+      "category": "public.app-category.social-networking"
+    },
    "win": {
-      "target": "squirrel"
+      "target": {
+        "target": "squirrel"
+      }
    },
    "directories": {
      "buildResources": "electron_app/build",
--- a/release.sh
+++ b/release.sh
@@ -7,6 +7,15 @@

 set -e

+orig_args=$@
+
+# chomp any args starting with '-' as these need to go
+# through to the release script and otherwise we'll get
+# confused about what the version arg is.
+while [[ "$1" == -* ]]; do
+    shift
+done
+
 cd `dirname $0`

 for i in matrix-js-sdk matrix-react-sdk
@@ -38,4 +47,4 @@ git commit package.json -m "$tag"

 cd ..

-exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
+exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args"
--- a/res/themes/status/css/_status.scss
+++ b/res/themes/status/css/_status.scss
@@ -76,6 +76,8 @@ $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);

@@ -283,4 +285,8 @@ $progressbar-color: #000;

 .mx_RoomSubList_chevron {
    top: 8px ! important;
-}
+}
+
+.mx_MemberInfo .mx_RoomTile_name {
+    color: $primary-fg-color ! important;
+}
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -24,10 +24,12 @@ const INCLUDE_LANGS = [
    {'value': 'fr', 'label': 'Français'},
    {'value': 'gl', 'label': 'Galego'},
    {'value': 'hu', 'label': 'Magyar'},
+    {'value': 'it', 'label': 'Italiano'},
    {'value': 'ko', 'label': '한국어'},
    {'value': 'lv', 'label': 'Latviešu'},
    {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
    {'value': 'nl', 'label': 'Nederlands'},
+    {'value': 'nn', 'label': 'Norsk Nynorsk'},
    {'value': 'pl', 'label': 'Polski'},
    {'value': 'pt', 'label': 'Português'},
    {'value': 'pt_BR', 'label': 'Português do Brasil'},
--- a/scripts/electron-package.sh
+++ b/scripts/electron-package.sh
@@ -100,7 +100,7 @@ mkdir -p "$projdir/electron_app/dist/unsigned/"
 # Install packages: what the user downloads the first time,
 # (DMGs for mac, exe installer for windows)
 mkdir -p "$pubdir/install/macos"
-cp $distdir/mac/*.dmg "$pubdir/install/macos/"
+cp $distdir/*.dmg "$pubdir/install/macos/"

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

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

 mkdir -p "$pubdir/update/win32/ia32/"
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -52,13 +52,7 @@ function dodep() {
    echo "$repo set to branch "`git -C "$repo" rev-parse --abbrev-ref HEAD`

    mkdir -p node_modules
-    rm -r "node_modules/$repo" 2>/dev/null || true
-    ln -sv "../$repo" node_modules/
-
-    (
-        cd $repo
-        npm install
-    )
+    npm link "./$repo"  # This does an npm install for us
 }

 ##############################
@@ -77,14 +71,15 @@ echo 'Setting up matrix-react-sdk'

 dodep matrix-org matrix-react-sdk

-# replace the version of js-sdk that got pulled into react-sdk with a symlink
+# replace the version of js-sdk that got pulled into react-sdk with a link
 # to our version. Make sure to do this *after* doing 'npm i' in react-sdk,
 # otherwise npm helpfully moves another-json from matrix-js-sdk/node_modules
 # into matrix-react-sdk/node_modules.
 #
 # (note this matches the instructions in the README.)
-rm -r node_modules/matrix-react-sdk/node_modules/matrix-js-sdk
-ln -s ../../matrix-js-sdk node_modules/matrix-react-sdk/node_modules/
+cd matrix-react-sdk
+npm link ../matrix-js-sdk
+cd ../

 echo -en 'travis_fold:end:matrix-react-sdk\r'

--- a/scripts/npm-sub.js
+++ b/scripts/npm-sub.js
@@ -0,0 +1,22 @@
+const path = require('path');
+const child_process = require('child_process');
+
+const moduleName = process.argv[2];
+if (!moduleName) {
+    console.error("Expected module name");
+    process.exit(1);
+}
+
+const argString = process.argv.length > 3 ? process.argv.slice(3).join(" ") : "";
+if (!argString) {
+    console.error("Expected an npm argument string to use");
+    process.exit(1);
+}
+
+const modulePath = path.dirname(require.resolve(`${moduleName}/package.json`));
+
+child_process.execSync("npm " + argString, {
+    env: process.env,
+    cwd: modulePath,
+    stdio: ['inherit', 'inherit', 'inherit'],
+});
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -3,5 +3,30 @@
    "Dismiss": "تجاهل",
    "Riot is not supported on mobile web. Install the app?": "رايوت غير مدعوم في وضعية الويب على الهاتف. هل تريد تثبيت التطبيق ؟",
    "Riot Desktop on %(platformName)s": "الواجهة المكتبية لرايوت على %(platformName)s",
-    "Unknown device": "جهاز مجهول"
+    "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) للسماح بمشاركة الشاشة",
+    "Co-ordination for Riot translators": "التنسيق لمترجمين Riot",
+    "powered by Matrix": "مشغل بواسطة Matrix",
+    "Welcome to Riot.im": "مرحبا بك في Riot.im",
+    "Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team",
+    "Implementing VoIP services with Matrix": "تنفيذ خدمات VoIP مع Matrix",
+    "Discussion of the Identity Service API": "مناقشة واجهة برمجة التطبيقات لخدمة الهوية",
+    "Support for those using, running and writing other bridges": "دعم لأولئك الذين يستخدمون الجسور الأخرى ويديرونها وكتابتهم",
+    "Implementing VR services with Matrix": "تنفيذ خدمات الواقع الافتراضي مع Matrix",
+    "Search the room directory": "ابحث في دليل الغرفة",
+    "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 الخ) أو مستقلة. تحقق من الدليل!",
+    "Chat with Riot Bot": "الدردشة مع  Riot Bot",
+    "Get started with some tips from Riot Bot!": "ابدأ ببعض النصائح من Riot Bot!",
+    "General discussion about Matrix and Riot": "مناقشة عامة حول Matrix و Riot",
+    "Discussion of all things Matrix!": "مناقشة كل شيء Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; دردشة سطح المكتب",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
+    "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 لخادم Home آخر.<br/>هذا يسمح لك باستخدام Riot مع حساب Matrix موجود على خادم منزل مختلف.<br/><br/>يمكنك أيضًا تعيين خادم هوية مخصص ولكنك لن تتمكن من دعوة المستخدمين عن طريق عنوان البريد الإلكتروني ، أو دعوتك عبر عنوان البريد الإلكتروني بنفسك.",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "[matrix] تعاون مدعوم مواسطة  &amp; دردشة لا مركزية ومشفرة",
+    "Matrix technical discussions": "مناقشات تقنية Matrix",
+    "Running Matrix services": "تشغيل خدمات Matrix",
+    "Community-run support for Synapse": "الدعم المجتمعي لـ Synapse",
+    "Admin support for Dendrite": "الدعم الاداري لـDendrite",
+    "Announcements about Synapse releases": "إعلانات حول إصدارات Synaps"
 }
--- a/src/i18n/strings/bn_IN.json
+++ b/src/i18n/strings/bn_IN.json
@@ -1 +1,3 @@
-{}
+{
+    "Riot is not supported on mobile web. Install the app?": "মোবাইল ওয়েব রায়ট সমর্থন করে না. অ্য়াপ টি ইনস্টল করতে চান?"
+}
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -3,14 +3,14 @@
    "Custom Server Options": "Opcions de servidor personalitzat",
    "Dismiss": "Omet",
    "Unknown device": "Dispositiu desconegut",
-    "Welcome to Riot.im": "Benvingut a Riot.im",
+    "Welcome to Riot.im": "Us donem la benvinguda a Riot.im",
    "Chat with Riot Bot": "Conversa amb el Bot de Riot",
    "Riot is not supported on mobile web. Install the app?": "Riot no és compatible amb la web per a mòbils. Voleu instal·lar l'aplicació per a mòbils?",
    "Riot Desktop on %(platformName)s": "Riot d'escriptori per a %(platformName)s",
    "You need to be using HTTPS to place a screen-sharing call.": "Heu d'utilitzar HTTPS per poder fer una trucada amb pantalla compartida.",
    "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.": "Podeu utilitzar opcions de servidor personalitzades per iniciar sessió en altres servidors Matrix especificant una URL diferent a la del servidor principal. <br/> Això us permet utilitzar Riot amb un compte de Matrix existent en un servidor d'origen diferent. <br/> <br/> També podeu establir un servidor d'identitat personalitzat, però no podreu convidar o ser convidat per correu electrònic.",
    "powered by Matrix": "amb tecnologia de Matrix",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Xat descentralitzat, encriptat &amp; col·laboració amb tecnologia de [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Xat descentralitzat, encriptat i col·laboratiu amb tecnologia de [matrix]",
    "Search the room directory": "Cerqueu el directori de sales",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Ja existeixen moltes sales a Matrix vinculades a xarxes existents (Slack, IRC, Gitter, etc.) o independents. Feu un cop d'ull al directori!",
    "Get started with some tips from Riot Bot!": "Comenceu amb alguns consells de Riot Bot!",
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -34,5 +34,6 @@
    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS a matrix-ios-sdk chat",
    "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."
+    "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"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -6,7 +6,7 @@
    "Unknown device": "Άγνωστη συσκευή",
    "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.",
    "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από περιηγητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
-    "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
+    "powered by Matrix": "βασισμένο στο Matrix",
    "Welcome to Riot.im": "Καλώς ήλθατε στο Riot.im",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία &amp; συνεργασία με τη βοήθεια του [matrix]",
    "Search the room directory": "Αναζήτηση του ευρετηρίου δωματίων",
@@ -22,16 +22,18 @@
    "Community-run support for Synapse": "Κοινοτική υποστήριξη για το Synapse",
    "Admin support for Dendrite": "Υποστήριξη διαχειριστή για το Dendrite",
    "Announcements about Synapse releases": "Ανακοινώσεις σχετικά με τις εκδόσεις του Synapse",
-    "Support for those using and running matrix-appservice-irc": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το matrix-appservice-irc",
+    "Support for those using and running matrix-appservice-irc": "Υποστήριξη για τους χρήστες του matrix-appservice-irc",
    "Building services on Matrix": "Ανάπτυξη υπηρεσιών στο Matrix",
    "Support for those using the Matrix spec": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το Matrix spec",
    "Design and implementation of E2E in Matrix": "Σχεδιασμός και υλοποίηση του E2E στο Matrix",
    "Implementing VR services with Matrix": "Υλοποίηση υπηρεσίων VR με το Matrix",
    "Implementing VoIP services with Matrix": "Υλοποίηση υπηρεσίων VoIP με το Matrix",
    "Discussion of the Identity Service API": "Συζήτηση σχετικά με το Identity Service API",
-    "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και Riot",
+    "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και στο Riot",
    "Dev chat for the Riot/Web dev team": "Συζήτηση με την ομάδα ανάπτυξης του Riot/Web",
    "Dev chat for the Dendrite dev team": "Συζήτηση με την ομάδα ανάπτυξης του Dendrite",
    "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"
+    "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/>Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης αλλά δεν θα μπορείτε να προσκαλέσετε χρήστες ή να προσκληθείτε εσείς μέσω διεύθυνσης ηλεκτρονικού ταχυδρομίου."
 }
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -33,5 +33,7 @@
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat"
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
+    "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.": "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.",
+    "Co-ordination for Riot translators": "Co-ordination for Riot translators"
 }
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -8,7 +8,7 @@
    "You need to be using HTTPS to place a screen-sharing call.": "Vi devas uzi HTTPS por ekranvidadi.",
    "Welcome to Riot.im": "Bonvenu al Riot.im",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Malcentra, ĉifrita babilado &amp; kunlaboro povigita de [matrix]",
-    "Search the room directory": "Serĉi en la ĉambrujo",
+    "Search the room directory": "Serĉi en la babilejo-listo",
    "Chat with Riot Bot": "Babilu kun la roboto Riot Bot",
    "Get started with some tips from Riot Bot!": "Komencu kun kelkaj sugestoj de la roboto Riot Bot!",
    "General discussion about Matrix and Riot": "Ĝenerala diskutado pri Matrix kaj Riot",
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -34,5 +34,6 @@
    "Dev chat for the Riot/Web dev team": "Conversaciones del equipo de desarrollo de Riot/Web",
    "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."
+    "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"
 }
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -33,5 +33,6 @@
    "Implementing VoIP services with Matrix": "پیاده‌سازی سرویس‌های VoIP با ماتریکس",
    "Discussion of the Identity Service API": "بحث درمورد API سرویس هویت",
    "Building services on Matrix": "ساخت سرویس بر روی ماتریکس",
-    "Support for those using the Matrix spec": "پشتیبانی برای آنان که از مستندات ماتریکس استفاده می‌کنند"
+    "Support for those using the Matrix spec": "پشتیبانی برای آنان که از مستندات ماتریکس استفاده می‌کنند",
+    "Co-ordination for Riot translators": "هماهنگی برای مترجمان Riot"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -4,9 +4,9 @@
    "powered by Matrix": "propulsé par Matrix",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s dans %(browserName)s sous %(osName)s",
    "Riot Desktop on %(platformName)s": "Version bureau de Riot sur %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot n’est pas supporté sur les appareils mobiles. Installer l’application ?",
+    "Riot is not supported on mobile web. Install the app?": "Riot n’est pas disponible en version web mobile. Installer l’application ?",
    "Unknown device": "Appareil inconnu",
-    "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
    "Welcome to Riot.im": "Bienvenue sur Riot.im",
    "Chat with Riot Bot": "Discussion avec Riot Bot",
    "Search the room directory": "Rechercher dans le répertoire de salons",
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -4,35 +4,36 @@
    "Dismiss": "Rexeitar",
    "powered by Matrix": "funciona grazas a Matrix",
    "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot no se pode executar na web móbil. Instalar a app?",
+    "Riot is not supported on mobile web. Install the app?": "Riot non se pode executar na web do móbil. Instalar a aplicación?",
    "Unknown device": "Dispositivo descoñecido",
    "You need to be using HTTPS to place a screen-sharing call.": "Precisa utilizar HTTPS para establecer unha chamada de pantalla compartida.",
-    "Welcome to Riot.im": "Benvida a Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat &amp; colaboración descentralizados e cifrados grazas a [matrix]",
+    "Welcome to Riot.im": "Benvida/o a Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversas e colaboración descentralizada e cifrada grazas a [matrix]",
    "Search the room directory": "Buscar no directorio de salas",
-    "Chat with Riot Bot": "Chat co Bot de Riot",
-    "Get started with some tips from Riot Bot!": "Iníciese con algúns consellos do Bot de Riot!",
+    "Chat with Riot Bot": "Conversa co bot de Riot",
+    "Get started with some tips from Riot Bot!": "Iníciese con algúns consellos do bot de Riot!",
    "General discussion about Matrix and Riot": "Discusión xeral sobre Matrix e Riot",
-    "Discussion of all things Matrix!": "Conversa sobre to o relativo a Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; chat de Escritorio",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; chat matrix-ios-sdk",
+    "Discussion of all things Matrix!": "Conversa sobre todo o relativo a Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; sala de conversas para escritorio",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; sala de conversas matrix-ios-sdk",
    "Matrix technical discussions": "Discusións técnicas sobre Matrix",
-    "Running Matrix services": "Servizos correndo sobre Matrix",
+    "Running Matrix services": "Servizos que empregan Matrix",
    "Community-run support for Synapse": "Axuda da comunidade para Synapse",
-    "Admin support for Dendrite": "Axuda administrador para Dendrite",
+    "Admin support for Dendrite": "Axuda de administrador para Dendrite",
    "Announcements about Synapse releases": "Anuncios sobre lanzamentos de Synapse",
    "Support for those using and running matrix-appservice-irc": "Axuda para quen usa matrix-appservice-irc",
    "Building services on Matrix": "Deseñando servizos sobre Matrix",
-    "Support for those using the Matrix spec": "Axuda para quen usa a especificación Matrix",
+    "Support for those using the Matrix spec": "Axuda para quen usa a especificación de Matrix",
    "Design and implementation of E2E in Matrix": "Deseño e implementación de E2E en Matrix",
    "Implementing VR services with Matrix": "Implementando servizos de RV con Matrix",
    "Implementing VoIP services with Matrix": "Implementación de servizos VoIP con Matrix",
-    "Discussion of the Identity Service API": "Conversa sobre a Identity Service API",
-    "Support for those using, running and writing other bridges": "Axuda para que utiliza, executa e desenvolve outras pontes",
-    "Contributing code to Matrix and Riot": "Contribuíndo ao código en Matrix e Riot",
-    "Dev chat for the Riot/Web dev team": "Chat para o equipo de desenvolvemento do Riot/Web",
-    "Dev chat for the Dendrite dev team": "Chat para o equipo de desenvolvemento de Dendrite",
-    "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, ligadas a redes existentes (Slack, IRC, Gitter etc) ou independentes. Busque no directorio!",
-    "Riot/Android &amp; matrix-android-sdk chat": "Chat para Riot/Android &amp; 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.": "Vostede pode utilizar as opcións de servidor personalizado para conectarse a outros servidores Matrix indicando o enderezo URL do Servidor.</br>Esto permítelle utilizar Riot con unha conta Matrix existente en outro servidor.<br/><br/>Tamén pode indicar un servidor de identidade pero non poderá convidar a usarias polo seu enderezo de correo electrónico, o ser convidada vostede por correo electrónico."
+    "Discussion of the Identity Service API": "Conversa sobre a API do servizo de identificación",
+    "Support for those using, running and writing other bridges": "Axuda para quen está a utilizar, executar ou desenvolver outras pontes",
+    "Contributing code to Matrix and Riot": "Contribuíndo ao código de Matrix e Riot",
+    "Dev chat for the Riot/Web dev team": "Sala de conversa para o equipo de desenvolvemento de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Sala de conversas para o equipo de desenvolvemento de Dendrite",
+    "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"
 }
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -34,6 +34,6 @@
    "Dev chat for the Riot/Web dev team": "Csevegés a Riot/Web fejlesztői csapatával fejlesztőknek",
    "Dev chat for the Dendrite dev team": "Csevegés a Dendrite fejlesztői csapatával fejlesztőknek",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Már sok szoba van a Matrixon: más hálózatokkal (Slack, IRC, Gitter stb.) összekapcsolt és függetlenek szobák is. Nézd meg a szobajegyzéket!",
-    "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 másik 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.",
+    "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"
 }
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -34,5 +34,6 @@
    "Dev chat for the Riot/Web dev team": "Obrolan Developer untuk tim developer Riot/Web",
    "Dev chat for the Dendrite dev team": "Obrolan Developer untuk tim developer Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Banyak ruang sudah tersedia di Matrix, terhubung ke jaringan yang sudah ada (Slack, IRC, Gitter dls) atau independen. Cek direktori!",
-    "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.": "Anda dapat menggunakan opsi lain untuk mendaftar pada server Matrix yang berbeda dengan memasukkan URL server yang sesuai. <br/>Hal ini memungkinkan anda untuk menggunakan Riot dengan akun matrix yang telah tersedia pada Home server yang berbeda.<br/><br/>Anda juga dapat melakukan pengubahan identitas server akan tetapi akan berakibat tidak dapat mengundang pengguna melalui email, atau diundang melalui email."
+    "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.": "Anda dapat menggunakan opsi lain untuk mendaftar pada server Matrix yang berbeda dengan memasukkan URL server yang sesuai. <br/>Hal ini memungkinkan anda untuk menggunakan Riot dengan akun matrix yang telah tersedia pada Home server yang berbeda.<br/><br/>Anda juga dapat melakukan pengubahan identitas server akan tetapi akan berakibat tidak dapat mengundang pengguna melalui email, atau diundang melalui email.",
+    "Co-ordination for Riot translators": "Koordinasi dengan penerjemah Riot"
 }
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -23,5 +23,17 @@
    "Co-ordination for Riot translators": "Yfirlit fyrir þýðendur Riot",
    "Search the room directory": "Leita í herbergisskránni",
    "Building services on Matrix": "Að byggja þjónustur á Matrix",
-    "Design and implementation of E2E in Matrix": "Hönnun og framkvæmd E2E í Matrix"
+    "Design and implementation of E2E in Matrix": "Hönnun og framkvæmd E2E í 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.": "Þú getur notað sérsniðna valkosti til að skrá inn á aðra Matrix-vefþjóna með því að tilgreina aðra slóð á Heimavefþjón.<br/>Þetta gerir þér kleift að nota Riot með fyrirliggjandi Matrix notandaaðgangi á öðrum heimaþjóni.<br/><br/>Þú getur líka stillt sérsniðinn auðkenningarþjón, en þá getur þú ekki boðið notendum eftir tölvupóstfangi eða sjálfur fengið boð með tölvupósti.",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall &amp; samstarfstól keyrt með [matrix]",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Margar spjallrásir eru til í Matrix, tengdar við fyrirliggjandi netkerfi (Slack, IRC, Gitter, o.s.frv.) eða óháð. Skoðaðu skráninguna!",
+    "Community-run support for Synapse": "Aðstoð frá samfélaginu fyrir Synapse",
+    "Admin support for Dendrite": "Kerfisstjórnarstuðningur fyrir Dendrite",
+    "Announcements about Synapse releases": "Tilkynningar um Synapse útgáfur",
+    "Support for those using and running matrix-appservice-irc": "Stuðningur við þá sem nota og keyra matrix-appservice-irc",
+    "Support for those using the Matrix spec": "Stuðningur við þá sem nota tæknilega Matrix eiginleika",
+    "Discussion of the Identity Service API": "Umræða um Identity Service API-kerfisviðmót",
+    "Support for those using, running and writing other bridges": "Stuðningur við þá sem nota, keyra og skrifa aðrar brýr",
+    "Dev chat for the Riot/Web dev team": "Forritaraspjall fyrir Riot/vefþróunarhópinn",
+    "Dev chat for the Dendrite dev team": "Forritaraspjall fyrir Dendrite þróunarhópinn"
 }
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1,11 +1,11 @@
 {
-    "Custom Server Options": "Opzioni Server Personalizzate",
-    "Dismiss": "Scarta",
+    "Custom Server Options": "Opzioni server personalizzate",
+    "Dismiss": "Chiudi",
    "powered by Matrix": "offerto da Matrix",
    "Riot Desktop on %(platformName)s": "Riot Desktop su %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot non è supportato sul web mobile. Vuoi installare l'applicazione?",
+    "Riot is not supported on mobile web. Install the app?": "Riot non è supportato sul web mobile. Installare l'applicazione?",
    "Unknown device": "Dispositivo sconosciuto",
-    "You need to be using HTTPS to place a screen-sharing call.": "Devi usare HTTPS per utilizzare una chiamata con condivisione schermo.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Devi usare HTTPS per effettuare una chiamata con la condivisione dello schermo.",
    "Welcome to Riot.im": "Benvenuto/a su Riot.im",
    "Search the room directory": "Cerca nella lista delle stanze",
    "Chat with Riot Bot": "Chatta con Riot Bot",
@@ -22,17 +22,18 @@
    "Support for those using and running matrix-appservice-irc": "Supporto per chi usa e amministra matrix-appservice-irc",
    "Building services on Matrix": "Costruzione servizi su Matrix",
    "Support for those using the Matrix spec": "Supporto per chi utilizza le specifiche Matrix",
-    "Design and implementation of E2E in Matrix": "Design e implementazione di E2E in Matrix",
+    "Design and implementation of E2E in Matrix": "Progetto e implementazione di E2E in Matrix",
    "Implementing VR services with Matrix": "Implementazione servizi VR con Matrix",
    "Implementing VoIP services with Matrix": "Implementazione servizi VoIP con Matrix",
-    "Discussion of the Identity Service API": "Discussione sull'Identity Service API",
-    "Support for those using, running and writing other bridges": "Supporto per chi usa, amministra e scrive altri bridge",
-    "Contributing code to Matrix and Riot": "Contributi al codice di Matrix e Riot",
-    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s su %(osName)s",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat criptate e collaborazioni decentralizzate offerte da [matrix]",
-    "Discussion of all things Matrix!": "Discussione su tutto quanto riguardi Matrix!",
+    "Discussion of the Identity Service API": "Discussione API del servizio identità",
+    "Support for those using, running and writing other bridges": "Supporto per chi usa, amministra e scrive altri ponti (bridge)",
+    "Contributing code to Matrix and Riot": "Contributi di codice per Matrix e Riot",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s tramite %(browserName)s su %(osName)s",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat criptate e decentralizzate &amp; collaborazione offerta da [matrix]",
+    "Discussion of all things Matrix!": "Discussione su tutto riguardo Matrix!",
    "Dev chat for the Riot/Web dev team": "Chat per gli sviluppatori di Riot/Web",
    "Dev chat for the Dendrite dev team": "Chat per gli sviluppatori di Dendrite",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!",
-    "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.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo dell'home server.<br/> Questo permette di usare Matrix con un account esistente su un home server diverso.<br/><br/>È anche possibile impostare un diverso identity server, ma in quel caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail."
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti esistenti (Slack, IRC, Gitter, ecc.) o indipendenti. Controlla l'elenco!",
+    "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.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo del server home.<br/> Questo permette di usare Riot con un account Matrix esistente su un server home diverso.<br/><br/>È anche possibile impostare un diverso server identità, ma in tal caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail.",
+    "Co-ordination for Riot translators": "Coordinazione per i traduttori di Riot"
 }
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -15,7 +15,7 @@
    "Chat with Riot Bot": "Riot Botと会話",
    "Get started with some tips from Riot Bot!": "Riot Botにヒントをもらって始めましょう！",
    "General discussion about Matrix and Riot": "MatrixとRiotの概略",
-    "Discussion of all things Matrix!": "Matrixなんでも討論",
+    "Discussion of all things Matrix!": "Matrixなんでも議論！",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; デスクトップ版チャット",
    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk チャット",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk チャット",
@@ -27,12 +27,13 @@
    "Support for those using and running matrix-appservice-irc": "matrix-appservice-ircを利用並びに運営している方へのサポート",
    "Building services on Matrix": "Matrixでのサービスの開発",
    "Support for those using the Matrix spec": "Matrixスペックを利用する方へのサポート",
-    "Design and implementation of E2E in Matrix": "Matrixでのデザインとエンドツーエンドの実装",
+    "Design and implementation of E2E in Matrix": "Matrixのデザインとエンドツーエンドの実装",
    "Implementing VR services with Matrix": "MatrixでのVRサービスの実装",
    "Implementing VoIP services with Matrix": "MatrixでのIP電話サービスの実装",
    "Discussion of the Identity Service API": "Identity Service APIの議論",
    "Support for those using, running and writing other bridges": "他のブリッジを利用、運営、作成している方へのサポート",
    "Contributing code to Matrix and Riot": "MatrixとRiotにコードを提供する",
    "Dev chat for the Riot/Web dev team": "Riot/Web開発者チームのための開発者チャット",
-    "Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット"
+    "Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット",
+    "Co-ordination for Riot translators": "Riot 翻訳者による共同作業"
 }
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@@ -0,0 +1,39 @@
+{
+    "Riot is not supported on mobile web. Install the app?": ".i lo samfonxa na kakne lo nu pilno la kibro nu zunti .i .au pei kibycpa le samtci",
+    "Riot Desktop on %(platformName)s": "la skami nu zunti ci'e la'o gy. %(platformName)s .gy.",
+    "Unknown device": "lo na'e te djuno se pilno",
+    "%(appName)s via %(browserName)s on %(osName)s": "la'o gy. %(appName)s .gy. xe be'i la'o gy. %(browserName)s .gy. ci'e la'o gy. %(osName)s .gy.",
+    "You need to be using HTTPS to place a screen-sharing call.": ".i la .hytytypysys. sarcu lo nu co'a vidni jorne",
+    "Custom Server Options": "lo macnu se cuxna be fi lo'i samse'u",
+    "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.": ".i zukte lo nu macnu cuxna lo samse'u kei goi ko'a lo nu pilno lo drata samse'u pe la nacmeimei<br/>.i ko'a se cumki lo nu do pilno lo pilno poi zvati lo drata samse'u pe la nacmeimei<br/><br/>.i ji'a cumki fa lo nu do pilno lo drata ke prenu datni samse'u kei goi ko'a .i ku'i ko'a to'e rinka la'a lo nu do zvacpe ja se zvacpe",
+    "Dismiss": "mipri",
+    "powered by Matrix": ".i la nacmeimei cu cumgau",
+    "Welcome to Riot.im": ".i fi'i lo pilno be la nu zunti",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": ".i la nacmeimei cu cumgau lo mifra je na'e se midju nu tavla je ke kansa gunka",
+    "Search the room directory": "sisku fi lo'i kumfa pe'a",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": ".i ci'e la nacmeimei cu kumfa pe'a fa so'i da noi jorne jo nai no'e jorne lo drata ciste no'u mu'a la .slak. jo'u lo te irci jo'u la .gityr. .i",
+    "Chat with Riot Bot": "tavla la nu zunti kei sampre",
+    "Get started with some tips from Riot Bot!": ".i .e'u la nu zunti kei sampre cu sidju ko",
+    "General discussion about Matrix and Riot": "lo nu casnu be la nacmeimei .e la nu zunti",
+    "Discussion of all things Matrix!": "lo nu casnu be ro me la nacmeimei",
+    "Riot/Web &amp; Desktop chat": "lo nu casnu be la kibro nu zunti .e la skami nu zunti",
+    "Running Matrix services": "lo nu ralte lo samtcise'u pe la nacmeimei",
+    "Community-run support for Synapse": "lo nu lo cecmu cu sidju fi tu'a la .sinaps.",
+    "Discussion of the Identity Service API": "lo nu casnu lo prenu datni favgau cimde",
+    "Contributing code to Matrix and Riot": "lo nu dunda lo samselpla la nacmeimei .a la nu zunti",
+    "Co-ordination for Riot translators": "lo nu lo fanva pe la nu zunti cu kansa gunka",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "lo nu casnu la plisyfonkemsamcmu nu zunti .e la'o gy. matrix-ios-sdk .gy.",
+    "Riot/Android &amp; matrix-android-sdk chat": "lo nu casnu la guglyfonkemsamcmu nu zunti .e la'o gy. matrix-android-sdk .gy.",
+    "Matrix technical discussions": "lo nu casnu lo zbaske be la nacmeimei",
+    "Announcements about Synapse releases": "lo notci be lo farvi tcini pe la nirna",
+    "Support for those using and running matrix-appservice-irc": "lo nu sidju lo pilno ja admine be la'o gy. matrix-appservice-irc .gy.",
+    "Building services on Matrix": "lo nu finti lo te selfu ji'u la nacmeimei",
+    "Support for those using the Matrix spec": "lo nu sidju lo pilno be lo sarcu pe la nacmeimei",
+    "Design and implementation of E2E in Matrix": "lo nu finti lo mulno mifra te platu .a lo samtcise'u be my. ji'u la nacmeimei",
+    "Support for those using, running and writing other bridges": "lo nu sidju lo pilno ja admine ja finti be lo drata te jorne",
+    "Dev chat for the Riot/Web dev team": "lo nu lo favgau be la kibro nu zunti cu casnu",
+    "Dev chat for the Dendrite dev team": "lo nu lo favgau be la nirndendriti cu casnu",
+    "Implementing VoIP services with Matrix": "lo nu finti lo samtcise'u be fi la .voip. ji'u la nacmeimei",
+    "Implementing VR services with Matrix": "lo nu finti lo samtcise'u be fi lo na'e fatci munje ji'u la nacmeimei",
+    "Admin support for Dendrite": "lo nu sidju lo admine be la nirndendriti"
+}
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@@ -0,0 +1,39 @@
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot ვებსაიტს არ აქვს მხარდაჭერა მობილური მოწყობილობებისთვის. გსურთ აპლიკაციის დაყენება?",
+    "Riot Desktop on %(platformName)s": "Riot Desktop-ი %(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-ს.",
+    "Custom Server Options": "პერსონალიზებული სერვერის პარამეტრები",
+    "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/>თქვენ ასევე შეგიძლიათ დააყენოთ პერსონალიზებული იდენტუროის სერვერი, მაგრამ თქვენ ვერ მოიწვევთ მომხმარებლებს ელფოსტის მისამართით და თავად თქვენ ვერ მოგიწვევენ ელფოსტის მისამართით.",
+    "Dismiss": "უარის თქმა",
+    "powered by Matrix": "Matrix-ზე დაფუძნებული",
+    "Welcome to Riot.im": "კეთილი იყოს თქვენი მობრძანება Riot.im-ზე",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "დეცენტრალიზებული, დაშიფრული ჩატი &amp; კოლაბორაცია, დაფუძნებული [matrix]-ზე",
+    "Search the room directory": "მოძებნა ოთახის სიაში",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "მრავალი ოთახი უკვე არსებობს Matrix-ში, რომლებიც არიან დაკავშირებული არსებულ ქსელებთან (Slack, IRC, Glitter და ა.შ) ან დამოუკიდებელი. შეამოწმეთ სია!",
+    "Chat with Riot Bot": "ისაუბრეთ Riot-ის Bot-თან",
+    "Get started with some tips from Riot Bot!": "დაიწყეთ რჩევებით Riot-ის Bot-ისგან!",
+    "General discussion about Matrix and Riot": "ზოგადი დისკუსია Matrix-სა და Riot-ზე",
+    "Discussion of all things Matrix!": "დისკუსია ყველაფერზე, რაც ეხება Matrix-ს!",
+    "Riot/Web &amp; Desktop chat": "Riot/ვებ-ისა &amp; Desktop-ის ჩატი",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS-ისა &amp; matrix-ios-sdk-ის ჩატი",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/ანდროიდისა &amp; matrix-android-sdk-ის ჩატი",
+    "Matrix technical discussions": "Matrix-ის ტექნიკური დისკუსიები",
+    "Running Matrix services": "Matrix-ის სერვისების გამოყენება",
+    "Community-run support for Synapse": "საზოგადოებისმიერი მხარდაჭერა Synapse-ისთვის",
+    "Admin support for Dendrite": "ადმინისტრატორის მხარდაჭერა Dendrite-ისთვის",
+    "Announcements about Synapse releases": "განცხადებები Synapse-ის გამოშვებებთან დაკავშირებით",
+    "Support for those using and running matrix-appservice-irc": "მხარდაჭერა მათთვის, ვინც იყენებს matrix-appservice-irc-ს",
+    "Building services on Matrix": "სერვისების Matrix-ზე დაფუძნებით გამომუშავება",
+    "Support for those using the Matrix spec": "მხარდაჭერა Matrix სპეციფიკაციების გამოყენებასთან დაკავშირებულ კითხვებზე",
+    "Design and implementation of E2E in Matrix": "პირით-პირამდე დაშიფვრის დაგეგმვა და შესრულება",
+    "Implementing VR services with Matrix": "VR სერვისების Matrix-ით შესრულება",
+    "Implementing VoIP services with Matrix": "VoIP სერვისების Matrix-ით შესრულება",
+    "Discussion of the Identity Service API": "იდენტიფიკაციის სერვისის API-ს დისკუსია",
+    "Support for those using, running and writing other bridges": "მხარდაჭერა მათთვის, ვინც იყენებს და წერს სხვა ხიდებს",
+    "Contributing code to Matrix and Riot": "Matrix-ის და Riot-ის გამომუშავებაში მონაწილეობის მიღება",
+    "Dev chat for the Riot/Web dev team": "დეველოპერების ჩატი Riot/ვებ დეველოპერების გუნდთან",
+    "Dev chat for the Dendrite dev team": "დეველოპერების ჩატი Dendrite-ის დეველოპერების გუნდთან",
+    "Co-ordination for Riot translators": "კოორდინაცია Riot-ის მთარგმნელებისთვის"
+}
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -1,37 +1,39 @@
 {
    "Custom Server Options": "사용자 지정 서버 설정",
    "Dismiss": "없애기",
-    "powered by Matrix": "매트릭스의 지원을 받고 있어요",
-    "Riot Desktop on %(platformName)s": "%(platformName)s에서 라이엇 컴퓨터판",
-    "Riot is not supported on mobile web. Install the app?": "라이엇은 모바일 사이트를 지원하지 않아요. 앱을 설치하시겠어요?",
+    "powered by Matrix": "Matrix의 지원을 받고 있습니다",
+    "Riot Desktop on %(platformName)s": "%(platformName)s PC용 Riot",
+    "Riot is not supported on mobile web. Install the app?": "”Riot은 모바일 사이트를 지원하지 않습니다. 앱을 설치하시겠어요?",
    "Unknown device": "알 수 없는 장치",
-    "Welcome to Riot.im": "라이엇에 오신 걸 환영해요",
-    "Chat with Riot Bot": "Riot 봇과 이야기하기",
+    "Welcome to Riot.im": "Riot에 오신 걸 환영해요",
+    "Chat with Riot Bot": "Riot 봇과 대화하기",
    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)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를 사용해야 합니다.",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "분산되고, 암호화된 대화 &amp; [matrix]의 지원으로 협력",
-    "Search the room directory": "방 목록을 찾기",
+    "Search the room directory": "방 목록 찾기",
    "Get started with some tips from Riot Bot!": "라이엇 봇에게 조언을 받고 시작하세요!",
-    "General discussion about Matrix and Riot": "매트릭스와 라이엇에 대한 일반 논의",
-    "Discussion of all things Matrix!": "매트릭스의 모든 것에 대한 토론!",
-    "Riot/Web &amp; Desktop chat": "라이엇/웹 &amp; 컴퓨터 이야기",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "라이엇/IOS &amp; matrix-ios-sdk 대화",
-    "Riot/Android &amp; matrix-android-sdk chat": "매트릭스/안드로이드 &amp; matrix-ios-sdk 대화",
-    "Matrix technical discussions": "매트릭스 기술 논의",
-    "Running Matrix services": "매트릭스 서비스 실행",
+    "General discussion about Matrix and Riot": "Matrix와 Riot에 대한 일반적인 토론",
+    "Discussion of all things Matrix!": "모든 Matrix에 대한 토론!",
+    "Riot/Web &amp; Desktop chat": "Riot/웹 &amp; PC 대화",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/IOS &amp; matrix-ios-sdk 대화",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-ios-sdk 대화",
+    "Matrix technical discussions": "Matrix에 대한 기술적인 토론",
+    "Running Matrix services": "Matrix 서비스 실행 중",
    "Community-run support for Synapse": "시냅스 커뮤니티 운영 지원",
-    "Admin support for Dendrite": "덴드라이트 관리 지원",
-    "Announcements about Synapse releases": "시냅스 공개 발표",
-    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 지원",
-    "Building services on Matrix": "매트릭스에서 서비스 구축",
+    "Admin support for Dendrite": "Dendrite 관리 지원",
+    "Announcements about Synapse releases": "Synapse 출시에 대한 발표",
+    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 위한 지원",
+    "Building services on Matrix": "Matrix에서 서비스 구축",
    "Support for those using the Matrix spec": "Matrix spec을 사용하는 사람들을 지원",
    "Design and implementation of E2E in Matrix": "매트릭스에서 E2E 설계와 구현",
    "Implementing VR services with Matrix": "매트릭스로 VR 서비스 구현",
-    "Implementing VoIP services with Matrix": "매트릭스로 인터넷전화 서비스 구현",
+    "Implementing VoIP services with Matrix": "Matrix로 인터넷전화 서비스 구현",
    "Discussion of the Identity Service API": "ID 서비스 API에 대한 논의",
-    "Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 지원",
-    "Contributing code to Matrix and Riot": "매트릭스와 라이엇에 코드 기여하기",
-    "Dev chat for the Riot/Web dev team": "라이엇/웹 개발 팀을 위한 개발자 대화",
+    "Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 위한 지원",
+    "Contributing code to Matrix and Riot": "Matrix와 Riot에 코드 기여하기",
+    "Dev chat for the Riot/Web dev team": "Riot/웹 개발 팀을 위한 개발자 대화",
    "Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방들이 이미 매트릭스에 있어요. 목록을 확인해보세요!"
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 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.": "사용자정의 서버 설정에서 다른 홈서버 URL를 지정해 다른 Matrix 서버에 접속할 수 있습니다. <br/>이렇게하면 다른 홈서버에서 기존의 Matrix 계정으로 Riot을 이용할 수 있습니다.<br/><br/>사용자정의 아이덴티티 서버도 설정할 수 있지만 이메일 주소로 이용자를 초대하거나 자신이 이메일 주소로 초대받을 수 없습니다."
 }
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1,38 +1,39 @@
 {
    "Unknown device": "Nežinomas įrenginys",
-    "powered by Matrix": "palaikomas Matrix",
+    "powered by Matrix": "veikia su Matrix",
    "Welcome to Riot.im": "Sveiki atvykę į Riot.im",
    "Chat with Riot Bot": "Kalbėtis su Riot robotu",
    "General discussion about Matrix and Riot": "Bendros diskusijos apie Matrix ir Riot",
    "Matrix technical discussions": "Matrix techninės diskusijos",
    "Riot is not supported on mobile web. Install the app?": "Riot nėra palaikoma naršant svetainėje mobiliaisiais įrenginiais. Įdiegti programėlę?",
-    "Riot Desktop on %(platformName)s": "Riot Desktop, %(platformName)s",
+    "Riot Desktop on %(platformName)s": "Riot Desktop, naudojant %(platformName)s",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s, naudojant %(osName)s",
    "You need to be using HTTPS to place a screen-sharing call.": "Norint skambinti su ekrano bendrinimo funkcija būtina naudoti HTTPS.",
-    "Custom Server Options": "Pasirinktiniai serverio nustatymai",
-    "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.": "Norėdami jungtis prie kito nei Matrix serverio galite pasirinktinio serverio nustatymuose nurodyti kito serverio URL adresą.<br/>Ši funkcija leis naudoti Riot su esama Matrix serverio paskyrą kituose serveriuose.<br/><br/>Taip pat galite nurodyti pasirinktinį identifikavimo serverį, bet tuomet negalėsite kviesti kitų vartotojų el. paštu ar jie jūsų.",
-    "Dismiss": "Nutraukti",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizuotas, šifruotas čatas; bendradarbiavimas palaikomas [matrix]",
+    "Custom Server Options": "Tinkinto serverio parametrai",
+    "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.": "Norėdami prisijungti prie kito nei Matrix serverio, galite naudoti tinkinto serverio parametrus ir nurodyti kito serverio URL adresą.<br/>Tai leis jums naudoti Riot su esama Matrix paskyra kituose serveriuose.<br/><br/>Taip pat galite nustatyti tinkintą tapatybės serverį, tačiau tuomet negalėsite pakviesti kitus naudotojus pagal el. paštą, o taip pat ir jie negalės pakviesti jūsų.",
+    "Dismiss": "Atmesti",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizuoti, šifruoti pokalbiai ir bendradarbiavimas, veikiantis su [matrix]",
    "Search the room directory": "Ieškoti kambarių kataloge",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Daugybė kambarių yra prisijungę prie Matrix, kurie yra susieti su egzistuojančiais tinklais (Slack, IRC, Gitter etc) arba nepriklausomi. Patikrinkite kambarių katalogą!",
-    "Get started with some tips from Riot Bot!": "Pradėkite su patarimais nuo Riot roboto!",
-    "Discussion of all things Matrix!": "Diskusijos apie viską Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Darbalaukio čatas",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
-    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
-    "Running Matrix services": "Vykdant Matrix servisus",
-    "Community-run support for Synapse": "Bendruomenės Synapse palaikymas",
-    "Admin support for Dendrite": "Administratoriaus Dendrite palaikymas",
-    "Announcements about Synapse releases": "Pranešimai apie Synapse naujinimus",
-    "Support for those using and running matrix-appservice-irc": "Palaikymas skirtas matrix-appservice-irc naudotojams",
-    "Building services on Matrix": "Servisų kūrimas ant Matrix",
-    "Support for those using the Matrix spec": "Palaikymas skirtas Matrix spec",
-    "Design and implementation of E2E in Matrix": "E2E dizainas ir įgyvendinimas Matrix'e",
-    "Implementing VR services with Matrix": "VR serviso įgyvendinimas su Matrix",
-    "Implementing VoIP services with Matrix": "VoIP serviso įgyvendinimas su Matrix",
-    "Discussion of the Identity Service API": "Diskusijos apie identifikavimo serviso API",
-    "Support for those using, running and writing other bridges": "Palaikymas skirtas tiems kas naudoja kitus tiltus",
-    "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
-    "Dev chat for the Riot/Web dev team": "Kūrėjų čatas Riot/Web dev team",
-    "Dev chat for the Dendrite dev team": "Kūrėjų čatas Dendrite dev team"
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Daugybė kambarių jau yra Matrix, susieti prie esamų tinklų (Slack, IRC, Gitter ir t.t.) arba nepriklausomi. Pasižvalgykite kataloge!",
+    "Get started with some tips from Riot Bot!": "Pradėkite darbo pradžią nuo Riot roboto patarimų!",
+    "Discussion of all things Matrix!": "Diskusijos apie viską, kas susiję su Matrix!",
+    "Riot/Web &amp; Desktop chat": "Pokalbiai apie Riot/Web ir Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Pokalbiai apie Riot/iOS ir matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Pokalbiai apie Riot/Android ir matrix-android-sdk",
+    "Running Matrix services": "Matrix paslaugų paleidimas",
+    "Community-run support for Synapse": "Su Synapse susijęs bendruomenės palaikymas",
+    "Admin support for Dendrite": "Dendrite administratorių palaikymas",
+    "Announcements about Synapse releases": "Skelbimai apie Synapse laidas",
+    "Support for those using and running matrix-appservice-irc": "Palaikymas skirtas besinaudojantiems ir prižiūrintiems matrix-appservice-irc",
+    "Building services on Matrix": "Paslaugų kūrimas, naudojant Matrix",
+    "Support for those using the Matrix spec": "Palaikymas skirtas besinaudojantiems Matrix specifikacija",
+    "Design and implementation of E2E in Matrix": "E2E dizainas ir įgyvendinimas ties Matrix",
+    "Implementing VR services with Matrix": "VR paslaugų įgyvendinimas ties Matrix",
+    "Implementing VoIP services with Matrix": "VoIP paslaugų įgyvendinimas ties Matrix",
+    "Discussion of the Identity Service API": "Diskusijos apie tapatybės paslaugos API",
+    "Support for those using, running and writing other bridges": "Palaikymas skirtas besinaudojantiems, prižiūrintiems ar kuriantiems kitus tinklų tiltus",
+    "Contributing code to Matrix and Riot": "Matrix ir Riot kodo plėtojimas",
+    "Dev chat for the Riot/Web dev team": "Kūrėjų pokalbiai, skirti Riot/Web kūrėjų komandai",
+    "Dev chat for the Dendrite dev team": "Kūrėjų pokalbiai, skirti Dendrite kūrėjų komandai",
+    "Co-ordination for Riot translators": "Koordinavimas Riot vertėjams"
 }
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1,4 +1,16 @@
 {
    "Custom Server Options": "Tilpassede serveralternativer",
-    "powered by Matrix": "benytter seg av Matrix"
+    "powered by Matrix": "benytter seg 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",
+    "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 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",
+    "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"
 }
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -34,5 +34,6 @@
    "Support for those using, running and writing other bridges": "Ondersteuning voor het gebruiken, draaien en ontwikkelen aan andere bruggen",
    "Dev chat for the Riot/Web dev team": "Dev-chat voor het Riot/Web ontwikkelteam",
    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite-ontwikkelteam",
-    "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.": "Je kan de custom server opties gebruiken om op andere Matrix server in te loggen door een andere Home server URL op te geven.<br/> Dit laat je toe om Riot te gebruiken met een bestaande Matrix account op een andere home server.<br/><br/>Je kan ook een custom identiteits-server opzetten maar dan kan je geen gebruikers uitnodigen via hun email adres, of zelf uitgenodigd worden via je email adres."
+    "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.": "Je kan de custom serveropties gebruiken om op andere Matrix-servers in te loggen door een andere thuisserver-URL op te geven.<br/> Dit laat je toe om Riot te gebruiken met een bestaand Matrix-account op een andere thuisserver.<br/><br/>Je kan ook een aangepaste-identiteitsserver opzetten maar dan kan je geen gebruikers uitnodigen via hun e-mailadres, of zelf uitgenodigd worden via je e-mailadres.",
+    "Co-ordination for Riot translators": "Coördinatie voor Riot vertalers"
 }
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -0,0 +1,39 @@
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot er ikkja støtta på mobilnettlesare. Last æppen inn?",
+    "Riot Desktop on %(platformName)s": "Riot på Skrivebord for %(platformName)s",
+    "Unknown device": "Ukjend eining",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s gjennom %(browserName)s på %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Du må bruka HTTPS for å ha ei samtale med skjermdeling.",
+    "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]",
+    "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",
+    "Get started with some tips from Riot Bot!": "Kom i gang med nokre råd frå Riot Bot!",
+    "General discussion about Matrix and Riot": "Allmenn meiningsutveksling om Matrix og Riot",
+    "Discussion of all things Matrix!": "Meiningsutveksling om alt som gjeld Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Skrivebordsprat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-prat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-prat",
+    "Matrix technical discussions": "Teknisk meiningsutveksling om Matrix",
+    "Running Matrix services": "Å køyra Matrix-tenestar",
+    "Community-run support for Synapse": "Samfunnsdriven støtte for Synapse",
+    "Admin support for Dendrite": "Administratorstøtte for Dendrite",
+    "Announcements about Synapse releases": "Kunngjeringar om Synapse-utgåver",
+    "Support for those using and running matrix-appservice-irc": "Støtte for dei som brukar og køyrar matrix-appleservice-irc",
+    "Building services on Matrix": "Byggingstenester på Matrix",
+    "Support for those using the Matrix spec": "Støtte for dei som brukar Matrix-specen",
+    "Design and implementation of E2E in Matrix": "E2E-oppbygging og -implementering på Matrix",
+    "Implementing VR services with Matrix": "Implementering av VR-tenester med Matrix",
+    "Implementing VoIP services with Matrix": "Implementering av VoIP-tenester med Matrix",
+    "Discussion of the Identity Service API": "Meiningsutveksling om Identitetstenar-APIen",
+    "Support for those using, running and writing other bridges": "Støtte for dei som brukar, køyrer og skriv andre bruer",
+    "Contributing code to Matrix and Riot": "For å bidraga med kode til Matrix og Riot",
+    "Dev chat for the Riot/Web dev team": "Utviklar-prat for Riot/Web-utviklargruppa",
+    "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."
+}
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -8,12 +8,12 @@
    "Unknown device": "Nieznane urządzenie",
    "You need to be using HTTPS to place a screen-sharing call.": "Musisz używać bezpiecznego protokołu HTTPS aby użyć połączenia współdzielenia ekranu.",
    "Welcome to Riot.im": "Witamy w Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca wspierana przez [matrix]",
-    "Search the room directory": "Wyszukaj katalog pokojów",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca oparta na [matrix]",
+    "Search the room directory": "Przeszukaj katalog pokojów",
    "Chat with Riot Bot": "Rozmowa z Botem Riota",
    "Get started with some tips from Riot Bot!": "Rozpocznij z wskazówkami Riot Bota!",
-    "General discussion about Matrix and Riot": "Generalna rozmowa o Matrix i Riot",
-    "Discussion of all things Matrix!": "Rozmowa o wszystkim Matrixowym!",
+    "General discussion about Matrix and Riot": "Ogólna rozmowa o Matrix i Riot",
+    "Discussion of all things Matrix!": "Rozmowa o wszystkich sprawach Matrixowych!",
    "Matrix technical discussions": "Dyskusje techniczne Matrixa",
    "Riot/Web &amp; Desktop chat": "Czat o Riot/Web i Desktop",
    "Riot/iOS &amp; matrix-ios-sdk chat": "Czat o Riot/iOS i matrix-ios-sdk",
@@ -29,10 +29,11 @@
    "Implementing VR services with Matrix": "Implementowanie usług wirtualnej rzeczywistości w oparciu o Matrix",
    "Implementing VoIP services with Matrix": "Implementowanie usług telefonii internetowej VoIP w oparciu o Matrix",
    "Discussion of the Identity Service API": "Dyskusja na temat API Identity Service",
-    "Support for those using, running and writing other bridges": "Wsparcie dla używających, zapewniających i piszących inne mosty",
-    "Contributing code to Matrix and Riot": "Wspieranie rozwoju Matrix i Riot",
+    "Support for those using, running and writing other bridges": "Wsparcie dla używających, utrzymujących i piszących inne mosty",
+    "Contributing code to Matrix and Riot": "Współtworzenie kodu do Matrix lub Riot",
    "Dev chat for the Riot/Web dev team": "Czat deweloperów zespołu Riot/Web",
    "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 dedykowanego 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ć dedykowany serwer tożsamości, ale nie będziesz w stanie zapraszać użytkowników przez adres email, lub otrzymywać zaproszeń na adres email."
+    "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"
 }
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -34,5 +34,6 @@
    "Dev chat for the Dendrite dev team": "Chat de desenvolvimento para o time devel do Dendrite",
    "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 impulsionado 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."
+    "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"
 }
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@@ -0,0 +1,39 @@
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot nu functionează pe mobil. Instalezi aplicaţia?",
+    "Riot Desktop on %(platformName)s": "Riot Desktop pe %(platformName)s",
+    "Unknown device": "Device necunoscut",
+    "Custom Server Options": "Opțiuni Server Personalizate",
+    "Dismiss": "Închide",
+    "powered by Matrix": "propulsat de Matrix",
+    "Welcome to Riot.im": "Bun venit pe Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat decentralizat, criptat &amp; colaborare propulsata de [matrix]",
+    "Search the room directory": "Caută în lista de camere",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Multe camere există deja in Matrix, conectate la rețele existente (Slack, IRC, Gitter etc) sau independente. Aruncă o privite in lista de camere!",
+    "Chat with Riot Bot": "Discută cu Riot Bot",
+    "Get started with some tips from Riot Bot!": "Începe cu câteva ponturi din partea Riot Bot!",
+    "General discussion about Matrix and Riot": "Discuție generală despre Matrix și Riot",
+    "Discussion of all things Matrix!": "Discuții despre toate subiectele Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Chat pentru desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; chat pentru matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; chat pentru matrix-android-sdk",
+    "Matrix technical discussions": "Discuții tehnice Matrix",
+    "Running Matrix services": "Rularea serviciilor Matrix",
+    "Community-run support for Synapse": "Suport cu ajutorul comunității pentru Synapse",
+    "Admin support for Dendrite": "Suport Administrare pentru Dendrite",
+    "Announcements about Synapse releases": "Anunțuri despre lansări Synapse",
+    "Support for those using and running matrix-appservice-irc": "Suport pentru cei care utilizează și rulează matrix-appservice-irc",
+    "Building services on Matrix": "Construirea serviciilor cu Matrix",
+    "Support for those using the Matrix spec": "Suport pentru cei ce utilizează specificațiile Matrix",
+    "Design and implementation of E2E in Matrix": "Designul și planificarea E2E în Matrix",
+    "Implementing VR services with Matrix": "Implementarea serviciilor VR cu Matrix",
+    "Implementing VoIP services with Matrix": "Implementarea serviciilor VoIP cu Matrix",
+    "Discussion of the Identity Service API": "Discuții despre API-ul Serviciul de Identitate",
+    "Support for those using, running and writing other bridges": "Suport pentru cei ce folosesc, rulează și programeaza alți conectori",
+    "Contributing code to Matrix and Riot": "Contribuirea codului pentru Matrix și Riot",
+    "Dev chat for the Riot/Web dev team": "Chat pentru echipa de dezvoltare Riot/Web",
+    "Dev chat for the Dendrite dev team": "Chat pentru echipa de dezvoltare Dendrite",
+    "Co-ordination for Riot translators": "Coordonare pentru translatorii Riot",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s pe %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Trebuie să folosești HTTPS pentru a plasa un apel de tip screen-sharing.",
+    "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.": "Poți folosi opțiunile server personalizate pentru a te conecta la alte servere Matrix prin specificarea unui URL de tip Home server diferit.<br/>Acestă opțiune îți permite să utilizezi Riot cu un cont existent pe un home server diferit.<br/><br/>Poți folosi și un server de identitate personalizat, dar nu vei putea invita alți utilizatori prin adresa de email sau să fii tu însuți invitat prim email."
+}
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -34,5 +34,6 @@
    "Support for those using, running and writing other bridges": "Podpora pre používateľov, prevádzkovateľov a tvorcov premostení do ďalších sietí",
    "Contributing code to Matrix and Riot": "Prispievanie kódu projektom Matrix a Riot",
    "Dev chat for the Riot/Web dev team": "Diskusia pre tím vývojárov Riot/Web",
-    "Dev chat for the Dendrite dev team": "Diskusia pre tím vývojárov Dendrite"
+    "Dev chat for the Dendrite dev team": "Diskusia pre tím vývojárov Dendrite",
+    "Co-ordination for Riot translators": "Koordinácia prekladov Riot"
 }
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1,5 +1,5 @@
 {
-    "Riot is not supported on mobile web. Install the app?": "Riot-i nuk mbulohet nën web për celularët. Të instalohet aplikacioni?",
+    "Riot is not supported on mobile web. Install the app?": "Riot-i nuk mbulohet në web për celularë. Të instalohet aplikacioni?",
    "Riot Desktop on %(platformName)s": "Riot Desktop në %(platformName)s",
    "Unknown device": "Pajisje e panjohur",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s përmes %(browserName)s nën %(osName)s",
@@ -9,7 +9,7 @@
    "Dismiss": "Mos e merr parasysh",
    "powered by Matrix": "bazuar në Matrix",
    "Welcome to Riot.im": "Mirë se vini te Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në [matrix]",
    "Search the room directory": "Kërkoni te drejtoria e dhomave",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Ka tashmë plot dhoma në Matrix, të lidhura me rrjete ekzistues (Slack, IRC, Gitter, etj) ose të pavarur. Hidhini një sy listës!",
    "Chat with Riot Bot": "Fjalosuni me Robotin Riot",
@@ -27,12 +27,13 @@
    "Support for those using and running matrix-appservice-irc": "Asistencë për ata që përdorin dhe xhirojnë matrix-appservice-irc",
    "Building services on Matrix": "Ndërtim shërbimesh mbi Matrix",
    "Support for those using the Matrix spec": "Asistencë për ata që përdorin specifikimet Matrix",
-    "Design and implementation of E2E in Matrix": "Konceptimi dhe sendërtimi i E2E në Matrix",
+    "Design and implementation of E2E in Matrix": "Konceptimi dhe sendërtimi i E2E-s në Matrix",
    "Implementing VR services with Matrix": "Sendërtim shërbimesh VR me Matrix-in",
    "Implementing VoIP services with Matrix": "Sendërtim shërbimesh VoIP me Matrix-in",
-    "Discussion of the Identity Service API": "Diskutime mbi Identity Service API",
+    "Discussion of the Identity Service API": "Diskutime mbi API-n Identity Service",
    "Support for those using, running and writing other bridges": "Asistencë për ata që përdorin, xhirojnë ose programojnë ura të tjera",
    "Contributing code to Matrix and Riot": "Kontribut me kod te Matrix dhe te Riot",
    "Dev chat for the Riot/Web dev team": "Fjalosje mbi zhvillimin, për ekipin e zhvilluesve të Riot/Web-i",
-    "Dev chat for the Dendrite dev team": "Fjalosje zhvillimi, për ekipin e zhvilluesve të Dendrite-it"
+    "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"
 }
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -34,5 +34,6 @@
    "Support for those using, running and writing other bridges": "Подршка за оне који користе, одржавају и пишу друге мостове",
    "Contributing code to Matrix and Riot": "Додавање кода у Матрикс и Riot",
    "Dev chat for the Riot/Web dev team": "Програмерско ћаскање за Riot/веб програмерски тим",
-    "Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим"
+    "Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим",
+    "Co-ordination for Riot translators": "Координација за Riot преводиоце"
 }
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1,12 +1,12 @@
 {
-    "Custom Server Options": "Egna serverinställningar",
+    "Custom Server Options": "Anpassade serverinställningar",
    "Dismiss": "Avvisa",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s på %(osName)s",
    "powered by Matrix": "drivs av Matrix",
    "Riot Desktop on %(platformName)s": "Riot Desktop på %(platformName)s",
    "Riot is not supported on mobile web. Install the app?": "Riot stöds inte på mobil-webb. Installera appen?",
    "Unknown device": "Okänd enhet",
-    "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att dela din skärm.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att ringa med skärmdelning.",
    "Welcome to Riot.im": "Välkommen till Riot.im",
    "Chat with Riot Bot": "Chatta med Riot Bot",
    "Get started with some tips from Riot Bot!": "Kom igång med några tips från Riot Bot!",
@@ -27,12 +27,13 @@
    "Dev chat for the Riot/Web dev team": "Chatt för utvecklare av Riot/Web",
    "Dev chat for the Dendrite dev team": "Chatt för utvecklare av Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Många rum finns redan i Matrix, länkade till andra nätverk (Slack, IRC, Gitter etc.) eller fristående. Kolla in katalogen!",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentraliserad, krypterad chatt &amp; samarbete möjliggjort med [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentraliserad, krypterad chatt &amp; samarbetsplattform möjliggjort med [matrix]",
    "Search the room directory": "Sök i rumskatalogen",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-chatt",
    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-chatt",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-chatt",
    "Admin support for Dendrite": "Hjälp för administratörer av Dendrite",
    "Building services on Matrix": "Bygga tjänster med 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.": "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."
+    "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"
 }
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1,17 +1,17 @@
 {
    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s işletim sisteminde %(browserName)s ile %(appName)s",
-    "Custom Server Options": "Özel Sunucu Seçenekleri",
-    "Dismiss": "Uzaklaştır",
+    "Custom Server Options": "Özelleştirilebilir Sunucu Seçenekleri",
+    "Dismiss": "Kapat",
    "powered by Matrix": "Matrix tarafından desteklenmektedir",
    "Riot Desktop on %(platformName)s": "%(platformName)s platformunda Riot Masaüstü",
    "Riot is not supported on mobile web. Install the app?": "Riot mobil web'de desteklenmiyor . Uygulamayı yükle ?",
    "Unknown device": "Bilinmeyen aygıt",
    "You need to be using HTTPS to place a screen-sharing call.": "Ekran paylaşımlı arama yapmak için HTTPS kullanıyor olmalısınız.",
-    "Welcome to Riot.im": "Riot.im'e Hoş Geldiniz",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dağıtık , şifreli sohbet &amp; işbirliği ile Matrix tarafından desteklenmektedir",
+    "Welcome to Riot.im": "Riot.im'e hoş geldiniz",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Merkezsiz, şifreli sohbet &amp; işbirliği ile Matrix tarafından desteklenmektedir",
    "Search the room directory": "Oda dizinini ara",
-    "Chat with Riot Bot": "Riot Bot ile Sohbet Et",
-    "Get started with some tips from Riot Bot!": "Bazı Riot Bot ipuçları ile başlayın !",
+    "Chat with Riot Bot": "Riot Bot ile sohbet et",
+    "Get started with some tips from Riot Bot!": "Riot Bot'tan bazı ipuçları ile başlayın!",
    "General discussion about Matrix and Riot": "Matrix ve Riot hakkında genel tartışma",
    "Discussion of all things Matrix!": "Matrix'in tüm tartışması!",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Masaüstü sohbet",
@@ -19,19 +19,21 @@
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk sohbet",
    "Matrix technical discussions": "Matrix teknik tartışmalar",
    "Running Matrix services": "Çalışan Matrix hizmetleri",
-    "Community-run support for Synapse": "Synapse için topluluk tarafından işlenen destek",
-    "Admin support for Dendrite": "Dendrite için Admin desteği",
+    "Community-run support for Synapse": "Synapse için topluluk tarafından işletilen destek",
+    "Admin support for Dendrite": "Dendrite için yönetici desteği",
    "Announcements about Synapse releases": "Synapse sürümleri hakkında duyurular",
    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc kullanan ve çalıştıran kullanıcılar için destek",
-    "Building services on Matrix": "Matrix üzerinde Yapı hizmetleri",
+    "Building services on Matrix": "Matrix üzerinde yapı hizmetleri",
    "Support for those using the Matrix spec": "Matrix teknik özelliklerini kullananlar için destek",
-    "Design and implementation of E2E in Matrix": "Matrix'te E2E ' nin Tasarım ve İmplementasyonu",
-    "Implementing VR services with Matrix": "Matrix'te VR hizmetlerini implement etmek",
-    "Implementing VoIP services with Matrix": "Matrix'te VoIP hizmetlerini implement etmek",
-    "Discussion of the Identity Service API": "Kimlik Hizmet API ( Identity Service API ) Tartışması",
+    "Design and implementation of E2E in Matrix": "Matrix'te E2E ' nin Tasarımı ve uyglamanması",
+    "Implementing VR services with Matrix": "Matrix'te VR hizmetlerini uygulamak",
+    "Implementing VoIP services with Matrix": "Matrix'te VoIP hizmetlerini uygulamak",
+    "Discussion of the Identity Service API": "Kimlik Hizmet API ( Identity Service API ) tartışması",
    "Support for those using, running and writing other bridges": "Diğer köprüleri kullanan , çalıştıran ve yazanlar için destek",
-    "Contributing code to Matrix and Riot": "Matrix ve Riot'a kod katkısı (contribution) sağla",
-    "Dev chat for the Riot/Web dev team": "Riot/Web Geliştirici takımı için Geliştirici sohbeti",
-    "Dev chat for the Dendrite dev team": "Dendrite Geliştirici Takımı için Geliştirici sohbeti",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix'te varolan ağlara (Slack , IRC , Gitter vb.) bağlı ya da bağımsız bir çok oda var . Dizini kontrol edin!"
+    "Contributing code to Matrix and Riot": "Matrix ve Riot'a kod katkısı sağlama",
+    "Dev chat for the Riot/Web dev team": "Riot/Web Geliştirici takımı için geliştirici sohbeti",
+    "Dev chat for the Dendrite dev team": "Dendrite geliştirici takımı için geliştirici sohbeti",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix'te var olan ağalara bağlı (Slack , IRC , Gitter vb.) birçok oda var. Dizini kontrol edin!",
+    "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.": "Farklı bir ev sunucusu URL'sini belirterek diğer Matrix sunucularına oturum açmak için özel sunucu seçeneklerini kullanabilirsiniz.<br />Bu, Riot'u başka bir ev sunucusu üzerinde var olan Matrix hesabını kullanmanıza olanak sağlar. <br/><br/> Ayrıca özelleştirilebilir bir kimlik de ayarlayabilirsiniz, ama kullanıcılırı ve kendinizi e-posta adreslerinden davet edemeyeceksiniz.",
+    "Co-ordination for Riot translators": "Riot çeviricileri için iş güdüm (koordinasyon)"
 }
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -34,5 +34,6 @@
    "Dev chat for the Dendrite dev team": "Чат команди розробників Dendrite",
    "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/>Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному  використовуючи адресу електронної пошти."
+    "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"
 }
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1,14 +1,14 @@
 {
-    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s 透過 %(browserName)s 在 %(osName)s",
+    "%(appName)s via %(browserName)s on %(osName)s": "在 %(osName)s 的 %(browserName)s 上的 %(appName)s",
    "Custom Server Options": "自訂伺服器選項",
-    "Dismiss": "無視",
-    "powered by Matrix": "由 Matrix 架設",
+    "Dismiss": "關閉",
+    "powered by Matrix": "由 Matrix 提供",
    "Unknown device": "未知裝置",
-    "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 來放置螢幕分享的通話。",
-    "Riot Desktop on %(platformName)s": "Riot 桌面版在 %(platformName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 來撥打螢幕分享的通話。",
+    "Riot Desktop on %(platformName)s": "%(platformName)s 的 Riot 桌面版",
    "Riot is not supported on mobile web. Install the app?": "Riot 不支援行動版網頁，要安裝應用程式嗎？",
    "Welcome to Riot.im": "歡迎來到 Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化、保密的聊天與協作，由 [matrix] 出品",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化、保密的聊天與協作，由 [matrix] 提供",
    "Search the room directory": "搜尋聊天室目錄",
    "Chat with Riot Bot": "與 Riot 機器人聊天",
    "Get started with some tips from Riot Bot!": "從 Riot 機器人了解使用 Riot 的訣竅吧！",
--- a/src/vector/getconfig.js
+++ b/src/vector/getconfig.js
@@ -0,0 +1,65 @@
+/*
+Copyright 2018 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.
+*/
+
+import Promise from 'bluebird';
+import request from 'browser-request';
+
+export async function getVectorConfig(relativeLocation) {
+    if (relativeLocation === undefined) relativeLocation = '';
+    if (relativeLocation !== '' && !relativeLocation.endsWith('/')) relativeLocation += '/';
+    try {
+        const configJson = await getConfig(`${relativeLocation}config.${document.domain}.json`);
+        // 404s succeed with an empty json config, so check that there are keys
+        if (Object.keys(configJson).length === 0) {
+            throw new Error(); // throw to enter the catch
+        }
+        return configJson;
+    } catch (e) {
+        return await getConfig(relativeLocation + "config.json");
+    }
+}
+
+function getConfig(configJsonFilename) {
+    return new Promise(function(resolve, reject) {
+        request(
+            { method: "GET", url: configJsonFilename },
+            (err, response, body) => {
+                if (err || response.status < 200 || response.status >= 300) {
+                    // Lack of a config isn't an error, we should
+                    // just use the defaults.
+                    // Also treat a blank config as no config, assuming
+                    // the status code is 0, because we don't get 404s
+                    // from file: URIs so this is the only way we can
+                    // not fail if the file doesn't exist when loading
+                    // from a file:// URI.
+                    if (response) {
+                        if (response.status == 404 || (response.status == 0 && body == '')) {
+                            resolve({});
+                        }
+                    }
+                    reject({err: err, response: response});
+                    return;
+                }
+
+                // We parse the JSON ourselves rather than use the JSON
+                // parameter, since this throws a parse error on empty
+                // which breaks if there's no config.json and we're
+                // loading from the filesystem (see above).
+                resolve(JSON.parse(body));
+            },
+        );
+    });
+}
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -37,6 +37,14 @@
    <section id="matrixchat" style="height: 100%;"></section>
    <noscript>Sorry, Riot requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
    <% for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) {
+        if (_.endsWith(htmlWebpackPlugin.files.js[i], 'olm.js')) {
+            var array = htmlWebpackPlugin.files.js;
+            htmlWebpackPlugin.files.js.unshift(htmlWebpackPlugin.files.js[i]);
+            htmlWebpackPlugin.files.js.splice(i, 1);
+        }
+       }
+
+       for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) {
        // Not a particularly graceful way of not putting the indexeddb worker script
        // into the main page
        if (_.endsWith(htmlWebpackPlugin.files.js[i], 'indexeddb-worker.js')) {
@@ -73,6 +81,6 @@
    </audio>
    <audio id="remoteAudio"></audio>
    <!-- let CSS themes pass constants to the app -->
-    <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div><div id="mx_theme_tertiaryAccentColor"/></div>
+    <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>
  </body>
 </html>
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 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.
@@ -15,20 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-'use strict';
-
-// for ES6 stuff like startsWith() that Safari doesn't handle
-// and babel doesn't do by default
-// Note we use this, as well as the babel transform-runtime plugin
-// since transform-runtime does not cover instance methods
-// such as "foobar".includes("foo") which bits of our library
-// code use, but the babel transform-runtime plugin allows the
-// regenerator runtime to be injected early enough in the process
-// (it can't be here as it's too late: the alternative is to put
-// the babel-polyfill as the first 'entry' in the webpack config).
-// https://babeljs.io/docs/plugins/transform-runtime/
-require('babel-polyfill');
-
 // Require common CSS here; this will make webpack process it into bundle.css.
 // Our own CSS (which is themed) is imported via separate webpack entry points
 // in webpack.config.js
@@ -37,36 +24,22 @@ require('gfm.css/gfm.css');
 require('highlight.js/styles/github.css');
 require('draft-js/dist/Draft.css');

-const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
-rageshake.init().then(() => {
-    console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
-    rageshake.cleanup();
-}, (err) => {
-    console.error("Failed to initialise rageshake: " + err);
-});
-
-window.addEventListener('beforeunload', (e) => {
-    console.log('riot-web closing');
-    // try to flush the logs to indexeddb
-    rageshake.flush();
-});
-
-
- // add React and ReactPerf to the global namespace, to make them easier to
- // access via the console
-global.React = require("react");
+import React from 'react';
+// add React and ReactPerf to the global namespace, to make them easier to
+// access via the console
+global.React = React;
 if (process.env.NODE_ENV !== 'production') {
-    global.Perf = require("react-addons-perf");
+    global.Perf = require('react-addons-perf');
 }

-var RunModernizrTests = require("./modernizr"); // this side-effects a global
-var ReactDOM = require("react-dom");
-var sdk = require("matrix-react-sdk");
-const PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
+import RunModernizrTests from './modernizr'; // this side-effects a global
+import ReactDOM from 'react-dom';
+import sdk from 'matrix-react-sdk';
+import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
 sdk.loadSkin(require('../component-index'));
-var VectorConferenceHandler = require('matrix-react-sdk/lib/VectorConferenceHandler');
+import VectorConferenceHandler from 'matrix-react-sdk/lib/VectorConferenceHandler';
 import Promise from 'bluebird';
-var request = require('browser-request');
+import request from 'browser-request';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
 // Also import _t directly so we can call it just `_t` as this is what gen-i18n.js expects
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
@@ -81,12 +54,33 @@ import SettingsStore, {SettingLevel} from "matrix-react-sdk/lib/settings/Setting
 import Tinter from 'matrix-react-sdk/lib/Tinter';
 import SdkConfig from "matrix-react-sdk/lib/SdkConfig";

-var lastLocationHashSet = null;
+import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";

-var CallHandler = require("matrix-react-sdk/lib/CallHandler");
-CallHandler.setConferenceHandler(VectorConferenceHandler);
+import CallHandler from 'matrix-react-sdk/lib/CallHandler';

-MatrixClientPeg.setIndexedDbWorkerScript(window.vector_indexeddb_worker_script);
+import {getVectorConfig} from './getconfig';
+
+let lastLocationHashSet = null;
+
+// Disable warnings for now: we use deprecated bluebird functions
+// and need to migrate, but they spam the console with warnings.
+Promise.config({warnings: false});
+
+function initRageshake() {
+    rageshake.init().then(() => {
+        console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
+
+        window.addEventListener('beforeunload', (e) => {
+            console.log('riot-web closing');
+            // try to flush the logs to indexeddb
+            rageshake.flush();
+        });
+
+        rageshake.cleanup();
+    }, (err) => {
+        console.error("Failed to initialise rageshake: " + err);
+    });
+}

 function checkBrowserFeatures(featureList) {
    if (!window.Modernizr) {
@@ -112,11 +106,6 @@ function checkBrowserFeatures(featureList) {
    return featureComplete;
 }

-var validBrowser = checkBrowserFeatures([
-    "displaytable", "flexbox", "es5object", "es5function", "localstorage",
-    "objectfit", "indexeddb", "webworkers",
-]);
-
 // Parse the given window.location and return parameters that can be used when calling
 // MatrixChat.showScreen(screen, params)
 function getScreenFromLocation(location) {
@@ -147,7 +136,7 @@ function onHashChange(ev) {

 // This will be called whenever the SDK changes screens,
 // so a web page can update the URL bar appropriately.
-var onNewScreen = function(screen) {
+function onNewScreen(screen) {
    console.log("newscreen "+screen);
    var hash = '#/' + screen;
    lastLocationHashSet = hash;
@@ -163,7 +152,7 @@ var onNewScreen = function(screen) {
 // If we're in electron, we should never pass through a file:// URL otherwise
 // the identity server will try to 302 the browser to it, which breaks horribly.
 // so in that instance, hardcode to use riot.im/app for now instead.
-var makeRegistrationUrl = function(params) {
+function makeRegistrationUrl(params) {
    let url;
    if (window.location.protocol === "file:") {
        url = 'https://riot.im/app/#/register';
@@ -189,40 +178,36 @@ var makeRegistrationUrl = function(params) {
    return url;
 }

-window.addEventListener('hashchange', onHashChange);
-
 function getConfig(configJsonFilename) {
-    let deferred = Promise.defer();
-
-    request(
-        { method: "GET", url: configJsonFilename },
-        (err, response, body) => {
-            if (err || response.status < 200 || response.status >= 300) {
-                // Lack of a config isn't an error, we should
-                // just use the defaults.
-                // Also treat a blank config as no config, assuming
-                // the status code is 0, because we don't get 404s
-                // from file: URIs so this is the only way we can
-                // not fail if the file doesn't exist when loading
-                // from a file:// URI.
-                if (response) {
-                    if (response.status == 404 || (response.status == 0 && body == '')) {
-                        deferred.resolve({});
+    return new Promise(function(resolve, reject) {
+        request(
+            { method: "GET", url: configJsonFilename },
+            (err, response, body) => {
+                if (err || response.status < 200 || response.status >= 300) {
+                    // Lack of a config isn't an error, we should
+                    // just use the defaults.
+                    // Also treat a blank config as no config, assuming
+                    // the status code is 0, because we don't get 404s
+                    // from file: URIs so this is the only way we can
+                    // not fail if the file doesn't exist when loading
+                    // from a file:// URI.
+                    if (response) {
+                        if (response.status == 404 || (response.status == 0 && body == '')) {
+                            resolve({});
+                        }
                    }
+                    reject({err: err, response: response});
+                    return;
                }
-                deferred.reject({err: err, response: response});
-                return;
-            }

-            // We parse the JSON ourselves rather than use the JSON
-            // parameter, since this throws a parse error on empty
-            // which breaks if there's no config.json and we're
-            // loading from the filesystem (see above).
-            deferred.resolve(JSON.parse(body));
-        }
-    );
-
-    return deferred.promise;
+                // We parse the JSON ourselves rather than use the JSON
+                // parameter, since this throws a parse error on empty
+                // which breaks if there's no config.json and we're
+                // loading from the filesystem (see above).
+                resolve(JSON.parse(body));
+            },
+        );
+    });
 }

 function onTokenLoginCompleted() {
@@ -238,6 +223,12 @@ function onTokenLoginCompleted() {
 }

 async function loadApp() {
+    initRageshake();
+    MatrixClientPeg.setIndexedDbWorkerScript(window.vector_indexeddb_worker_script);
+    CallHandler.setConferenceHandler(VectorConferenceHandler);
+
+    window.addEventListener('hashchange', onHashChange);
+
    await loadLanguage();

    const fragparts = parseQsFromFragment(window.location);
@@ -251,15 +242,7 @@ async function loadApp() {
    let configJson;
    let configError;
    try {
-        try {
-            configJson = await getConfig(`config.${document.domain}.json`);
-            // 404s succeed with an empty json config, so check that there are keys
-            if (Object.keys(configJson).length === 0) {
-                throw new Error(); // throw to enter the catch
-            }
-        } catch (e) {
-            configJson = await getConfig("config.json");
-        }
+        configJson = await getVectorConfig();
    } catch (e) {
        configError = e;
    }
@@ -270,34 +253,18 @@ async function loadApp() {

    // don't try to redirect to the native apps if we're
    // verifying a 3pid (but after we've loaded the config)
-    const preventRedirect = Boolean(fragparts.params.client_secret);
+    // or if the user is following a deep link
+    // (https://github.com/vector-im/riot-web/issues/7378)
+    const preventRedirect = fragparts.params.client_secret || fragparts.location.length > 0;

    if (!preventRedirect) {
-        if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-            // FIXME: ugly status hardcoding
-            if (SettingsStore.getValue("theme") === 'status') {
-                window.location = "https://status.im/join-riot.html";
+        const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+        const isAndroid = /Android/.test(navigator.userAgent);
+        if (isIos || isAndroid) {
+            if (!document.cookie.split(';').some((c) => c.startsWith('mobile_redirect_to_guide'))) {
+                window.location = "mobile_guide/";
                return;
            }
-            else {
-                if (confirm(_t("Riot is not supported on mobile web. Install the app?"))) {
-                    window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067";
-                    return;
-                }
-            }
-        }
-        else if (/Android/.test(navigator.userAgent)) {
-            // FIXME: ugly status hardcoding
-            if (SettingsStore.getValue("theme") === 'status') {
-                window.location = "https://status.im/join-riot.html";
-                return;
-            }
-            else {
-                if (confirm(_t("Riot is not supported on mobile web. Install the app?"))) {
-                    window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha";
-                    return;
-                }
-            }
        }
    }

@@ -322,12 +289,23 @@ async function loadApp() {
                // in case the Tinter.tint() in MatrixChat fires before the
                // CSS has actually loaded (which in practice happens)...

-                // FIXME: we should probably block loading the app or even
-                // showing a spinner until the theme is loaded, to avoid
-                // flashes of unstyled content.
-                a.onload = () => {
+                // This if fixes Tinter.setTheme to not fire on Firefox
+                // in case it is the first time loading Riot.
+                // `InstallTrigger` is a Object which only exists on Firefox
+                // (it is used for their Plugins) and can be used as a
+                // feature check. 
+                // Firefox loads css always before js. This is why we dont use
+                // onload or it's EventListener as thoose will never trigger.
+                if (typeof InstallTrigger !== 'undefined') {
                    Tinter.setTheme(theme);
-                };
+                } else {
+                    // FIXME: we should probably block loading the app or even
+                    // showing a spinner until the theme is loaded, to avoid
+                    // flashes of unstyled content.
+                    a.onload = () => {
+                        Tinter.setTheme(theme);
+                    };
+                }
            } else {
                // Firefox requires this to not be done via `setAttribute`
                // or via HTML.
@@ -337,17 +315,19 @@ async function loadApp() {
        }
    }

-    if (window.localStorage && window.localStorage.getItem('mx_accepts_unsupported_browser')) {
-        console.log('User has previously accepted risks in using an unsupported browser');
-        validBrowser = true;
-    }
+    const validBrowser = checkBrowserFeatures([
+        "displaytable", "flexbox", "es5object", "es5function", "localstorage",
+        "objectfit", "indexeddb", "webworkers",
+    ]);
+
+    const acceptInvalidBrowser = window.localStorage && window.localStorage.getItem('mx_accepts_unsupported_browser');

    console.log("Vector starting at "+window.location);
    if (configError) {
        window.matrixChat = ReactDOM.render(<div className="error">
            Unable to load config file: please refresh the page to try again.
        </div>, document.getElementById('matrixchat'));
-    } else if (validBrowser) {
+    } else if (validBrowser || acceptInvalidBrowser) {
        const platform = PlatformPeg.get();
        platform.startUpdater();

@@ -374,7 +354,6 @@ async function loadApp() {
        window.matrixChat = ReactDOM.render(
            <CompatibilityPage onAccept={function() {
                if (window.localStorage) window.localStorage.setItem('mx_accepts_unsupported_browser', true);
-                validBrowser = true;
                console.log("User accepts the compatibility risks.");
                loadApp();
            }} />,
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -0,0 +1,24 @@
+import {getVectorConfig} from '../getconfig';
+
+function onBackToRiotClick() {
+    document.cookie = 'mobile_redirect_to_guide=false;path=/';
+    window.location.href = '../';
+}
+
+async function initPage() {
+    document.getElementById('back_to_riot_button').onclick = onBackToRiotClick;
+
+    const config = await getVectorConfig('..');
+    let hsUrl;
+    if (config && config['default_hs_url']) {
+        hsUrl = config['default_hs_url'];
+    }
+    if (hsUrl && !hsUrl.endsWith('/')) hsUrl += '/';
+    if (hsUrl && hsUrl !== 'https://matrix.org/') {
+        document.getElementById('step2_container').style.display = 'block';
+        document.getElementById('hs_url').innerHTML = hsUrl;
+        document.getElementById('step_login_header').innerHTML= 'Step 3: Register or Log in';
+    }
+}
+
+initPage();
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -143,7 +143,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
            {
                body: msg,
                icon: avatarUrl,
-                tag: 'vector',
                silent: true, // we play our own sounds
            },
        );
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -68,11 +68,11 @@ export default class WebPlatform extends VectorBasePlatform {
        // annoyingly, the latest spec says this returns a
        // promise, but this is only supported in Chrome 46
        // and Firefox 47, so adapt the callback API.
-        const defer = Promise.defer();
-        global.Notification.requestPermission((result) => {
-            defer.resolve(result);
+        return new Promise(function(resolve, reject) {
+            global.Notification.requestPermission((result) => {
+                resolve(result);
+            });
        });
-        return defer.promise;
    }

    displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
@@ -103,31 +103,31 @@ export default class WebPlatform extends VectorBasePlatform {
    }

    _getVersion(): Promise<string> {
-        const deferred = Promise.defer();
-
        // We add a cachebuster to the request to make sure that we know about
        // the most recent version on the origin server. That might not
        // actually be the version we'd get on a reload (particularly in the
        // presence of intermediate caching proxies), but still: we're trying
        // to tell the user that there is a new version.
-        request(
-            {
-                method: "GET",
-                url: "version",
-                qs: { cachebuster: Date.now() },
-            },
-            (err, response, body) => {
-                if (err || response.status < 200 || response.status >= 300) {
-                    if (err === null) err = { status: response.status };
-                    deferred.reject(err);
-                    return;
-                }

-                const ver = body.trim();
-                deferred.resolve(ver);
-            },
-        );
-        return deferred.promise;
+        return new Promise(function(resolve, reject) {
+            request(
+                {
+                    method: "GET",
+                    url: "version",
+                    qs: { cachebuster: Date.now() },
+                },
+                (err, response, body) => {
+                    if (err || response.status < 200 || response.status >= 300) {
+                        if (err === null) err = { status: response.status };
+                        reject(err);
+                        return;
+                    }
+
+                    const ver = body.trim();
+                    resolve(ver);
+                },
+            );
+        });
    }

    getAppVersion(): Promise<string> {
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,9 +8,13 @@ if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/rio

 module.exports = {
    entry: {
-        "bundle": "./src/vector/index.js",
+        // Load babel-polyfill first to avoid issues where some imports (namely react)
+        // are potentially loaded before babel-polyfill.
+        "bundle": ["babel-polyfill", "./src/vector/index.js"],
        "indexeddb-worker": "./src/vector/indexeddb-worker.js",

+        "mobileguide": "./src/vector/mobile_guide/index.js",
+
        // We ship olm.js as a separate lump of javascript. This makes it get
        // loaded via a separate <script/> tag in index.html (which loads it
        // into the browser global `Olm`, where js-sdk expects to find it).
@@ -26,29 +30,40 @@ module.exports = {
        "theme-status": "./res/themes/status/css/status.scss",
    },
    module: {
-        preLoaders: [
-            { test: /\.js$/, loader: "source-map-loader" },
-        ],
-        loaders: [
-            { test: /\.json$/, loader: "json" },
-            { test: /\.js$/, loader: "babel", include: path.resolve('./src') },
+        rules: [
+            { enforce: 'pre', test: /\.js$/, use: "source-map-loader", exclude: /node_modules/, },
+            { test: /\.js$/, use: "babel-loader", include: path.resolve(__dirname, 'src') },
            {
                test: /\.scss$/,
-
                // 1. postcss-loader turns the SCSS into normal CSS.
-                // 2. css-raw-loader turns the CSS into a javascript module
+                // 2. raw-loader turns the CSS into a javascript module
                //    whose default export is a string containing the CSS.
-                //    (css-raw-loader is similar to css-loader, but the latter
+                //    (raw-loader is similar to css-loader, but the latter
                //    would also drag in the imgs and fonts that our CSS refers to
                //    as webpack inputs.)
                // 3. ExtractTextPlugin turns that string into a separate asset.
-                loader: ExtractTextPlugin.extract("css-raw-loader!postcss-loader?config=postcss.config.js"),
+                use: ExtractTextPlugin.extract({
+                    use: [
+                        "raw-loader",
+                        {
+                            loader: 'postcss-loader',
+                            options: {
+                                config: {
+                                    path: './postcss.config.js'
+                                }
+                            }
+                        }
+                    ],
+                }),
            },
            {
                // this works similarly to the scss case, without postcss.
                test: /\.css$/,
-                loader: ExtractTextPlugin.extract("css-raw-loader"),
+                use: ExtractTextPlugin.extract({
+                    use: "raw-loader"
+                }),
            },
+
        ],
        noParse: [
            // for cross platform compatibility use [\\\/] as the path separator
@@ -126,10 +141,16 @@ module.exports = {
            // bottom of <head> or the bottom of <body>, and I'm a bit scared
            // about moving them.
            inject: false,
+            excludeChunks: ['mobileguide'],
            vars: {
                og_image_url: og_image_url,
            },
        }),
+        new HtmlWebpackPlugin({
+            template: './src/vector/mobile_guide/index.html',
+            filename: 'mobile_guide/index.html',
+            chunks: ['mobileguide'],
+        }),
    ],
    devtool: 'source-map',

@@ -142,6 +163,12 @@ module.exports = {
            // don't fill the console up with a mahoosive list of modules
            chunks: false,
        },
+
+        // hot mdule replacement doesn't work (I think we'd need react-hot-reload?)
+        // so webpack-dev-server reloads the page on every update which is quite
+        // tedious in Riot since that can take a while.
+        hot: false,
+        inline: false,
    },
 };