From a233af67eab6f15bc2a1743976e9f0966f3e897c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Jan 2018 02:02:48 +0000
Subject: [PATCH 001/218] initial pseudocode WIP for e2e online backups

---
 src/SuggestKeyRestoreHandler.js               | 96 +++++++++++++++++++
 src/components/structures/MatrixChat.js       |  6 ++
 .../views/dialogs/SuggestKeyBackupDialog.js   | 68 +++++++++++++
 .../views/dialogs/SuggestKeyRestoreDialog.js  | 77 +++++++++++++++
 4 files changed, 247 insertions(+)
 create mode 100644 src/SuggestKeyRestoreHandler.js
 create mode 100644 src/components/views/dialogs/SuggestKeyBackupDialog.js
 create mode 100644 src/components/views/dialogs/SuggestKeyRestoreDialog.js

diff --git a/src/SuggestKeyRestoreHandler.js b/src/SuggestKeyRestoreHandler.js
new file mode 100644
index 0000000000..3383889c1e
--- /dev/null
+++ b/src/SuggestKeyRestoreHandler.js
@@ -0,0 +1,96 @@
+/*
+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 sdk from './index';
+import Modal from './Modal';
+
+export default class SuggestKeyRestoreHandler {
+    constructor(matrixClient) {
+        this._matrixClient = matrixClient;
+    }
+
+    handleSuggestKeyRestore() {
+        const onVerifyDevice = () => {
+            const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+
+            Modal.createTrackedDialog('Key Restore', 'Starting verification', DeviceVerifyDialog, {
+                // userId: this.props.userId,
+                // device: this.state.deviceInfo,
+                onFinished: (verified) => {
+                    if (verified) {
+                        this.props.onFinished();
+                    }
+                },
+            });
+        };
+
+        const onRecoverFromBackup = () => {
+             // XXX: we need this so that you can get at it from UserSettings too
+             // * prompt for recovery key
+             // * Download the current backup version info from the server and check the key decrypts it okay.
+             // * Check that the public key for that backup version matches the recovery key
+             // * show a spinner
+             // * Download all the existing keys from the server
+             // * Decrypt them using the recovery key
+             // * Add them to the local store (which encrypts them as normal with "DEFAULT KEY"
+             // * Enable incremental backups for this device.
+        };
+
+        const onIgnoreSuggestion = () => {
+        };
+
+        const onFinished = () => {
+            this.suggestBackup();
+        };
+
+        // FIXME: need a way to know if an account has ever touched E2E before.
+        // Perhaps we can extend toDevice to include a flag if it's the first time the
+        // server has ever sent a room_key to a client or something?
+        const virginAccount = false;
+
+        if (virginAccount) {
+            this.suggestBackup();
+            return;
+        }
+
+        const SuggestKeyRestoreDialog = sdk.getComponent("dialogs.SuggestKeyRestoreDialog");
+        Modal.createTrackedDialog('Key Restore', 'Key Restore', SuggestKeyRestoreDialog, {
+            matrixClient: this._matrixClient,
+            isOnlyDevice: false, // FIXME
+            hasOnlineBackup: false, // FIXME
+            onVerifyDevice: onVerifyDevice,
+            onRecoverFromBackup: onRecoverFromBackup,
+            onIgnoreSuggestion: onIgnoreSuggestion,
+            onFinished: onFinished,
+        });
+    }
+
+    suggestBackup() {
+        if (hasOnlineBackup) return;
+
+        const onStartNewBackup = () => {
+          // XXX: we need this so that you can get at it from UserSettings too
+          // * Upload all their existing keys from their session store to the backup using the bulk upload API.
+          //   (Having re-encrypted them using the backup keypair rather than the static one used to store them on disk)
+        };
+
+        const SuggestKeyBackupDialog = sdk.getComponent("dialogs.SuggestKeyBackupDialog");
+        Modal.createTrackedDialog('Key Backup', 'Key Backup', SuggestKeyBackupDialog, {
+            onStartNewBackup: onStartNewBackup,
+        });        
+    }    
+}
+
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 733007677b..4b04f4cf1d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1129,6 +1129,12 @@ export default React.createClass({
         cli.on("crypto.roomKeyRequestCancellation", (req) => {
             krh.handleKeyRequestCancellation(req);
         });
+
+        const skrh = new SuggestKeyRestoreHandler(cli);
+        cli.on("crypto.suggestKeyRestore", () => {
+            skrh.handleSuggestKeyRestore();
+        });
+
         cli.on("Room", (room) => {
             if (MatrixClientPeg.get().isCryptoEnabled()) {
                 const blacklistEnabled = SettingsStore.getValueAt(
diff --git a/src/components/views/dialogs/SuggestKeyBackupDialog.js b/src/components/views/dialogs/SuggestKeyBackupDialog.js
new file mode 100644
index 0000000000..c2d6cfc60f
--- /dev/null
+++ b/src/components/views/dialogs/SuggestKeyBackupDialog.js
@@ -0,0 +1,68 @@
+/*
+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 Modal from '../../../Modal';
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+
+import { _t, _td } from '../../../languageHandler';
+
+/**
+ * Dialog which asks the user whether they want to restore megolm keys
+ * from various sources when they first start using E2E on a new device.
+ */
+export default React.createClass({
+    propTypes: {
+        onStartNewBackup: PropTypes.func.isRequired,
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+
+        return (
+            <BaseDialog className='mx_SuggestKeyRestoreDialog'
+                onFinished={this.props.onFinished}
+                title={_t('Backup encryption keys on your server?')}
+            >
+            <div>
+                <p>To avoid ever losing your encrypted message history, you
+                can save your encryption keys on the server, protected by a recovery key.
+                </p>
+                <p>To maximise security, your recovery key is never stored by the app,
+                so you must store it yourself somewhere safe.</p>
+                <p>
+                <p>Warning: storing your encryption keys on the server means that
+                if someone gains access to your account and also steals your recovery key,
+                they will be able to read all of your encrypted conversation history.
+                </p>
+
+                <p>Do you wish to generate a recovery key and backup your encryption
+                keys on the server?
+
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.props.onStartNewBackup}>
+                        { _t("Generate recovery key and enable online backups") }
+                    </button>
+                    <button onClick={this.props.onFinished}>
+                        { _t("I'll stick to manual backups") }
+                    </button>
+                </div>
+            </div>
+            </BaseDialog>
+        );
+    },
+});
diff --git a/src/components/views/dialogs/SuggestKeyRestoreDialog.js b/src/components/views/dialogs/SuggestKeyRestoreDialog.js
new file mode 100644
index 0000000000..2a711e0231
--- /dev/null
+++ b/src/components/views/dialogs/SuggestKeyRestoreDialog.js
@@ -0,0 +1,77 @@
+/*
+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 Modal from '../../../Modal';
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+
+import { _t, _td } from '../../../languageHandler';
+
+/**
+ * Dialog which asks the user whether they want to restore megolm keys
+ * from various sources when they first start using E2E on a new device.
+ */
+export default React.createClass({
+    propTypes: {
+        matrixClient: PropTypes.object.isRequired,
+        isOnlyDevice: PropTypes.bool.isRequired,
+        hasOnlineBackup: PropTypes.bool.isRequired,
+        onVerifyDevice: PropTypes.func.isRequired,
+        onImportBackup: PropTypes.func.isRequired,
+        onRecoverFromBackup: PropTypes.func.isRequired,
+        onIgnoreSuggestion: PropTypes.func.isRequired,
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+
+        return (
+            <BaseDialog className='mx_SuggestKeyRestoreDialog'
+                onFinished={this.props.onFinished}
+                title={_t('Restore encryption keys')}
+            >
+            <div>
+                <p>We don't have a way to decrypt older messages on this device.</p>
+
+                <p>Your options are:</p>
+
+                <li>
+                    { !this.props.isOnlyDevice ? <ul>Verify this device from one or more of your other ones to automatically sync keys</ul>: '' }
+                    { this.props.hasOnlineBackup ? <ul>Enter your recovery key to restore encryption keys from your online backup</ul> : '' }
+                    <ul>Import encryption keys from an offline backup</ul>
+                    <ul>Continue without restoring keys, syncing keys from your other devices on a best effort basis</ul>
+                </li>
+
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.props.onVerifyDevice}>
+                        { _t('Verify this device') }
+                    </button>
+                    <button onClick={this.props.onRecoverFromBackup}>
+                        { _t('Restore from online backup') }
+                    </button>
+                    <button onClick={this.props.onImportBackup}>
+                        { _t('Restore from offline backup') }
+                    </button>
+                    <button onClick={this.props.onIgnoreClicked}>
+                        { _t('Ignore request') }
+                    </button>
+                </div>
+            </div>
+            </BaseDialog>
+        );
+    },
+});

From 24fcea8a0a13a16a095c5df270fcc1654530ddca Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Jan 2018 02:19:15 +0000
Subject: [PATCH 002/218] fix indenting

---
 .../views/dialogs/SuggestKeyRestoreDialog.js  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/components/views/dialogs/SuggestKeyRestoreDialog.js b/src/components/views/dialogs/SuggestKeyRestoreDialog.js
index 2a711e0231..3419b6235c 100644
--- a/src/components/views/dialogs/SuggestKeyRestoreDialog.js
+++ b/src/components/views/dialogs/SuggestKeyRestoreDialog.js
@@ -44,33 +44,33 @@ export default React.createClass({
                 onFinished={this.props.onFinished}
                 title={_t('Restore encryption keys')}
             >
-            <div>
-                <p>We don't have a way to decrypt older messages on this device.</p>
+                <div>
+                    <p>We don't have a way to decrypt older messages on this device.</p>
 
-                <p>Your options are:</p>
+                    <p>Your options are:</p>
 
-                <li>
-                    { !this.props.isOnlyDevice ? <ul>Verify this device from one or more of your other ones to automatically sync keys</ul>: '' }
-                    { this.props.hasOnlineBackup ? <ul>Enter your recovery key to restore encryption keys from your online backup</ul> : '' }
-                    <ul>Import encryption keys from an offline backup</ul>
-                    <ul>Continue without restoring keys, syncing keys from your other devices on a best effort basis</ul>
-                </li>
+                    <li>
+                        { !this.props.isOnlyDevice ? <ul>Verify this device from one or more of your other ones to automatically sync keys</ul>: '' }
+                        { this.props.hasOnlineBackup ? <ul>Enter your recovery key to restore encryption keys from your online backup</ul> : '' }
+                        <ul>Import encryption keys from an offline backup</ul>
+                        <ul>Continue without restoring keys, syncing keys from your other devices on a best effort basis</ul>
+                    </li>
 
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.props.onVerifyDevice}>
-                        { _t('Verify this device') }
-                    </button>
-                    <button onClick={this.props.onRecoverFromBackup}>
-                        { _t('Restore from online backup') }
-                    </button>
-                    <button onClick={this.props.onImportBackup}>
-                        { _t('Restore from offline backup') }
-                    </button>
-                    <button onClick={this.props.onIgnoreClicked}>
-                        { _t('Ignore request') }
-                    </button>
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={this.props.onVerifyDevice}>
+                            { _t('Verify this device') }
+                        </button>
+                        <button onClick={this.props.onRecoverFromBackup}>
+                            { _t('Restore from online backup') }
+                        </button>
+                        <button onClick={this.props.onImportBackup}>
+                            { _t('Restore from offline backup') }
+                        </button>
+                        <button onClick={this.props.onIgnoreClicked}>
+                            { _t('Ignore request') }
+                        </button>
+                    </div>
                 </div>
-            </div>
             </BaseDialog>
         );
     },

From 52cdf609540f1883abfec9bb3998f330fa2e5bf0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 26 May 2018 20:27:48 -0600
Subject: [PATCH 003/218] Add options to pin unread/mentioned rooms to the top
 of the room list

Fixes https://github.com/vector-im/riot-web/issues/6604
Fixes https://github.com/vector-im/riot-web/issues/732
Fixes https://github.com/vector-im/riot-web/issues/1104

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomSubList.js  | 21 ++++++++++++++++++++-
 src/components/structures/UserSettings.js |  2 ++
 src/i18n/strings/en_EN.json               |  2 ++
 src/settings/Settings.js                  | 10 ++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index fb82ee067b..b3c9d5f1b6 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -17,6 +17,8 @@ limitations under the License.
 
 'use strict';
 
+import SettingsStore from "../../settings/SettingsStore";
+
 var React = require('react');
 var ReactDOM = require('react-dom');
 var classNames = require('classnames');
@@ -98,8 +100,10 @@ var RoomSubList = React.createClass({
     componentWillReceiveProps: function(newProps) {
         // order the room list appropriately before we re-render
         //if (debug) console.log("received new props, list = " + newProps.list);
+        const filteredRooms = this.applySearchFilter(newProps.list, newProps.searchFilter);
+        const sortedRooms = newProps.order === "recent" ? this.applyPinnedTileRules(filteredRooms) : filteredRooms;
         this.setState({
-            sortedList: this.applySearchFilter(newProps.list, newProps.searchFilter),
+            sortedList: sortedRooms,
         });
     },
 
@@ -110,6 +114,21 @@ var RoomSubList = React.createClass({
         });
     },
 
+    applyPinnedTileRules: function(list) {
+        const pinUnread = SettingsStore.getValue("pinUnreadRooms");
+        const pinMentioned = SettingsStore.getValue("pinMentionedRooms");
+        if (!pinUnread && !pinMentioned) {
+            return list; // Nothing to sort
+        }
+
+        const mentioned = !pinMentioned ? [] : list.filter(room => room.getUnreadNotificationCount("highlight") > 0);
+        const unread = !pinUnread ? [] : list.filter(room => Unread.doesRoomHaveUnreadMessages(room));
+
+        return mentioned
+            .concat(unread.filter(room => !mentioned.find(other => other === room)))
+            .concat(list.filter(room => !unread.find(other => other === room)));
+    },
+
     // The header is collapsable if it is hidden or not stuck
     // The dataset elements are added in the RoomList _initAndPositionStickyHeaders method
     isCollapsableOnClick: function() {
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c8ce79905d..3695e0cf9f 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -81,6 +81,8 @@ const SIMPLE_SETTINGS = [
     { id: "VideoView.flipVideoHorizontally" },
     { id: "TagPanel.disableTagPanel" },
     { id: "enableWidgetScreenshots" },
+    { id: "pinMentionedRooms" },
+    { id: "pinUnreadRooms" },
 ];
 
 // These settings must be defined in SettingsStore
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf9e395bee..1b378c34d3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -218,6 +218,8 @@
     "Enable URL previews for this room (only affects you)": "Enable URL previews for this room (only affects you)",
     "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room",
     "Room Colour": "Room Colour",
+    "Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list",
+    "Pin rooms I'm mentioned in to the top of the room list": "Pin rooms I'm mentioned in to the top of the room list",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b1bc4161fd..1665a59dfd 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -269,6 +269,16 @@ export const SETTINGS = {
         default: true,
         controller: new AudioNotificationsEnabledController(),
     },
+    "pinMentionedRooms": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Pin rooms I'm mentioned in to the top of the room list"),
+        default: false,
+    },
+    "pinUnreadRooms": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Pin unread rooms to the top of the room list"),
+        default: false,
+    },
     "enableWidgetScreenshots": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable widget screenshots on supported widgets'),

From 292b1f09af60b294a1a73cb512339cbc3179ad6d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 13 Sep 2018 17:11:46 +0100
Subject: [PATCH 004/218] WIP e2e key backups

Continues from Matthew's work: adds a feature flag & panel in
user settings to create a backup.

Can't restore a backup yet, nor even continue backing up to the same
backup after a refresh.
---
 res/css/_components.scss                      |   1 +
 .../views/dialogs/_CreateKeyBackupDialog.scss |  25 ++
 src/components/structures/MatrixChat.js       |   2 +
 src/components/structures/UserSettings.js     |  11 +
 .../views/dialogs/SuggestKeyBackupDialog.js   |  68 ------
 .../keybackup/CreateKeyBackupDialog.js        | 230 ++++++++++++++++++
 .../views/settings/KeyBackupPanel.js          | 134 ++++++++++
 src/i18n/strings/en_EN.json                   |  33 +++
 src/settings/Settings.js                      |   6 +
 9 files changed, 442 insertions(+), 68 deletions(-)
 create mode 100644 res/css/views/dialogs/_CreateKeyBackupDialog.scss
 delete mode 100644 src/components/views/dialogs/SuggestKeyBackupDialog.js
 create mode 100644 src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
 create mode 100644 src/components/views/settings/KeyBackupPanel.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0e40b40a29..e8a8877d62 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -33,6 +33,7 @@
 @import "./views/dialogs/_ChatInviteDialog.scss";
 @import "./views/dialogs/_ConfirmUserActionDialog.scss";
 @import "./views/dialogs/_CreateGroupDialog.scss";
+@import "./views/dialogs/_CreateKeyBackupDialog.scss";
 @import "./views/dialogs/_CreateRoomDialog.scss";
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
diff --git a/res/css/views/dialogs/_CreateKeyBackupDialog.scss b/res/css/views/dialogs/_CreateKeyBackupDialog.scss
new file mode 100644
index 0000000000..a422cf858c
--- /dev/null
+++ b/res/css/views/dialogs/_CreateKeyBackupDialog.scss
@@ -0,0 +1,25 @@
+/*
+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.
+*/
+
+.mx_CreateKeyBackupDialog {
+    padding-right: 40px;
+}
+
+.mx_CreateKeyBackupDialog_recoveryKey {
+    padding: 20px;
+    color: $info-plinth-fg-color;
+    background-color: $info-plinth-bg-color;
+}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 39e973e8f7..900cd57b90 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -48,6 +48,8 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
 
+import SuggestKeyRestoreHandler from "../../SuggestKeyRestoreHandler";
+
 /** constants for MatrixChat.state.view */
 const VIEWS = {
     // a special initial state which is only used at startup, while we are
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 53e1ddea71..b5cbf5bd89 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -736,6 +736,16 @@ module.exports = React.createClass({
                 </div>
             );
         }
+
+        let keyBackupSection;
+        if (SettingsStore.isFeatureEnabled("feature_keybackup")) {
+            const KeyBackupPanel = sdk.getComponent('views.settings.KeyBackupPanel');
+            keyBackupSection = <div className="mx_UserSettings_section">
+                <h3>{ _t("Key Backup") }</h3>
+                <KeyBackupPanel />
+            </div>;
+        }
+
         return (
             <div>
                 <h3>{ _t("Cryptography") }</h3>
@@ -751,6 +761,7 @@ module.exports = React.createClass({
                 <div className="mx_UserSettings_section">
                     { CRYPTO_SETTINGS.map( this._renderDeviceSetting ) }
                 </div>
+                {keyBackupSection}
             </div>
         );
     },
diff --git a/src/components/views/dialogs/SuggestKeyBackupDialog.js b/src/components/views/dialogs/SuggestKeyBackupDialog.js
deleted file mode 100644
index c2d6cfc60f..0000000000
--- a/src/components/views/dialogs/SuggestKeyBackupDialog.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-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 Modal from '../../../Modal';
-import React from 'react';
-import PropTypes from 'prop-types';
-import sdk from '../../../index';
-
-import { _t, _td } from '../../../languageHandler';
-
-/**
- * Dialog which asks the user whether they want to restore megolm keys
- * from various sources when they first start using E2E on a new device.
- */
-export default React.createClass({
-    propTypes: {
-        onStartNewBackup: PropTypes.func.isRequired,
-    },
-
-    render: function() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-
-        return (
-            <BaseDialog className='mx_SuggestKeyRestoreDialog'
-                onFinished={this.props.onFinished}
-                title={_t('Backup encryption keys on your server?')}
-            >
-            <div>
-                <p>To avoid ever losing your encrypted message history, you
-                can save your encryption keys on the server, protected by a recovery key.
-                </p>
-                <p>To maximise security, your recovery key is never stored by the app,
-                so you must store it yourself somewhere safe.</p>
-                <p>
-                <p>Warning: storing your encryption keys on the server means that
-                if someone gains access to your account and also steals your recovery key,
-                they will be able to read all of your encrypted conversation history.
-                </p>
-
-                <p>Do you wish to generate a recovery key and backup your encryption
-                keys on the server?
-
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.props.onStartNewBackup}>
-                        { _t("Generate recovery key and enable online backups") }
-                    </button>
-                    <button onClick={this.props.onFinished}>
-                        { _t("I'll stick to manual backups") }
-                    </button>
-                </div>
-            </div>
-            </BaseDialog>
-        );
-    },
-});
diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
new file mode 100644
index 0000000000..03410f4f7d
--- /dev/null
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -0,0 +1,230 @@
+/*
+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 Modal from '../../../../Modal';
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../../index';
+import MatrixClientPeg from '../../../../MatrixClientPeg';
+import { formatCryptoKey } from '../../../../utils/FormattingUtils';
+import Promise from 'bluebird';
+
+import { _t, _td } from '../../../../languageHandler';
+
+const PHASE_INTRO = 0;
+const PHASE_GENERATING = 1;
+const PHASE_SHOWKEY = 2;
+const PHASE_MAKEBACKUP = 3;
+const PHASE_UPLOAD = 4;
+const PHASE_DONE = 5;
+
+// XXX: copied from ShareDialog: factor out into utils
+function selectText(target) {
+    const range = document.createRange();
+    range.selectNodeContents(target);
+
+    const selection = window.getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+}
+
+/**
+ * Walks the user through the process of creating an e22 key backup
+ * on the server.
+ */
+export default React.createClass({
+    getInitialState: function() {
+        return {
+            phase: PHASE_INTRO,
+        };
+    },
+
+    componentWillMount: function() {
+        this._recoveryKeyNode = null;
+        this._keyBackupInfo = null;
+    },
+
+    _collectRecoveryKeyNode: function(n) {
+        this._recoveryKeyNode = n;
+    },
+
+    _copyRecoveryKey: function() {
+        selectText(this._recoveryKeyNode);
+        const successful = document.execCommand('copy');
+        if (successful) {
+            this.setState({copied: true});
+        }
+    },
+
+    _createBackup: function() {
+        this.setState({
+            phase: PHASE_MAKEBACKUP,
+            error: null,
+        });
+        this._createBackupPromise = MatrixClientPeg.get().createKeyBackupVersion(
+            this._keyBackupInfo,
+        ).then((info) => {
+            this.setState({
+                phase: PHASE_UPLOAD,
+            });
+            return MatrixClientPeg.get().backupAllGroupSessions(info.version);
+        }).then(() => {
+            this.setState({
+                phase: PHASE_DONE,
+            });
+        }).catch(e => {
+            console.log("Error creating key backup", e);
+            this.setState({
+                error: e,
+            });
+        });
+    },
+
+    _onCancel: function() {
+        this.props.onFinished(false);
+    },
+
+    _onDone: function() {
+        this.props.onFinished(true);
+    },
+
+    _generateKey: async function() {
+        this.setState({
+            phase: PHASE_GENERATING,
+        });
+        // Look, work is being done!
+        await Promise.delay(1200);
+        this._keyBackupInfo = MatrixClientPeg.get().prepareKeyBackupVersion();
+        this.setState({
+            phase: PHASE_SHOWKEY,
+        });
+    },
+
+    _renderPhaseIntro: function() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            <p>To avoid ever losing your encrypted message history, you
+            can save your encryption keys on the server, protected by a recovery key.
+            </p>
+            <p>To maximise security, your recovery key is never stored by the app,
+            so you must store it yourself somewhere safe.</p>
+            <p>Warning: storing your encryption keys on the server means that
+            if someone gains access to your account and also steals your recovery key,
+            they will be able to read all of your encrypted conversation history.
+            </p>
+
+            <p>Do you wish to generate a recovery key and backup your encryption
+            keys on the server?</p>
+
+            <DialogButtons primaryButton={_t('Generate recovery key')}
+                onPrimaryButtonClick={this._generateKey}
+                onCancel={this._onCancel}
+                cancelButton={_t("I'll stick to manual backups")}
+            />
+        </div>;
+    },
+
+    _renderPhaseShowKey: function() {
+        return <div>
+            <p>{_t("Here is your recovery key:")}</p>
+            <p className="mx_CreateKeyBackupDialog_recoveryKey">
+                <code ref={this._collectRecoveryKeyNode}>{formatCryptoKey(this._keyBackupInfo.recovery_key)}</code>
+            </p>
+            <p>{_t("This key can decrypt your full message history.")}</p>
+            <p>{_t(
+                "When you've saved it somewhere safe, proceed to the next step where the key will be used to "+
+                "create an encrypted backup of your message keys and then destroyed."
+            )}</p>
+            <div className="mx_Dialog_buttons">
+                <button onClick={this._copyRecoveryKey}>
+                    {this.state.copied ? _t("Copied!") : _t("Copy to clipboard")}
+                </button>
+                <button onClick={this._createBackup}>
+                    {_t("Proceed")}
+                </button>
+            </div>
+        </div>;
+    },
+
+    _renderBusyPhase: function(text) {
+        const Spinner = sdk.getComponent('views.elements.Spinner');
+        return <div>
+            <p>{_t(text)}</p>
+            <Spinner />
+        </div>;
+    },
+
+    _renderPhaseDone: function() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            <p>{_t("Backup created")}</p>
+            <p>{_t("Your encryption keys are now being backed up to your Homeserver.")}</p>
+            <DialogButtons primaryButton={_t('Close')}
+                onPrimaryButtonClick={this._onDone}
+                hasCancel={false}
+            />
+        </div>;
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+
+        let content;
+        if (this.state.error) {
+            content = <div>
+                <p>{_t("Unable to create key backup")}</p>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this._createBackup}>
+                        {_t("Retry")}
+                    </button>
+                </div>
+            </div>;
+        } else {
+            switch (this.state.phase) {
+                case PHASE_INTRO:
+                    content = this._renderPhaseIntro();
+                    break;
+                case PHASE_GENERATING:
+                    content = this._renderBusyPhase(_td("Generating recovery key..."));
+                    break;
+                case PHASE_SHOWKEY:
+                    content = this._renderPhaseShowKey();
+                    break;
+                case PHASE_MAKEBACKUP:
+                    content = this._renderBusyPhase(_td("Creating backup..."));
+                    break;
+                case PHASE_UPLOAD:
+                    content = this._renderBusyPhase(_td("Uploading keys..."));
+                    break;
+                case PHASE_DONE:
+                    content = this._renderPhaseDone();
+                    break;
+            }
+        }
+
+        return (
+            <BaseDialog className='mx_CreateKeyBackupDialog'
+                onFinished={this.props.onFinished}
+                title={_t('Create Key Backup')}
+                hasCancel={[PHASE_INTRO, PHASE_DONE].includes(this.state.phase)}
+            >
+            <div>
+                {content}
+            </div>
+            </BaseDialog>
+        );
+    },
+});
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
new file mode 100644
index 0000000000..3b452e77f8
--- /dev/null
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -0,0 +1,134 @@
+/*
+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 React from 'react';
+import PropTypes from 'prop-types';
+
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+
+export default class KeyBackupPanel extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this._startNewBackup = this._startNewBackup.bind(this);
+        this._deleteBackup = this._deleteBackup.bind(this);
+
+        this._unmounted = false;
+        this.state = {
+            loading: true,
+            error: null,
+            backupInfo: null,
+        };
+        this._loadBackupStatus();
+    }
+
+    componentWillUnmount() {
+        this._unmounted = true;
+    }
+
+    async _loadBackupStatus() {
+        this.setState({loading: true});
+        try {
+            const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            if (this._unmounted) return;
+            this.setState({
+                backupInfo,
+                loading: false,
+            });
+        } catch (e) {
+            console.log("Unable to fetch key backup status", e);
+            if (this._unmounted) return;
+            this.setState({
+                error: e,
+                loading: false,
+            });
+            return;
+        }
+    }
+
+    _startNewBackup() {
+        const CreateKeyBackupDialog = sdk.getComponent("dialogs.keybackup.CreateKeyBackupDialog");
+        Modal.createTrackedDialog('Key Backup', 'Key Backup', CreateKeyBackupDialog, {
+            onFinished: () => {
+                this._loadBackupStatus();
+            },
+        });
+    }
+
+    _deleteBackup() {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        Modal.createTrackedDialog('Delete Backup', '', QuestionDialog, {
+            title: _t("Delete Backup"),
+            description: _t(
+                "Delete your backed up encryption keys from the server? " +
+                "You will no longer be able to use your recovery key to read encrypted message history"
+            ),
+            button: _t('Delete backup'),
+            danger: true,
+            onFinished: (proceed) => {
+                if (!proceed) return;
+                this.setState({loading: true});
+                MatrixClientPeg.get().deleteKeyBackupVersion(this.state.backupInfo.version).then(() => {
+                    this._loadBackupStatus();
+                });
+            },
+        });
+        
+    }
+
+    render() {
+        const Spinner = sdk.getComponent("elements.Spinner");
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
+        if (this.state.error) {
+            return (
+                <div className="error">
+                    {_t("Unable to load key backup status")}
+                </div>
+            );
+        } else if (this.state.loading) {
+            return <Spinner />;
+        } else if (this.state.backupInfo) {
+            let clientBackupStatus;
+            if (MatrixClientPeg.get().getKeyBackupEnabled()) {
+                clientBackupStatus = _t("This device is uploading keys to this backup");
+            } else {
+                // XXX: display why and how to fix it
+                clientBackupStatus = _t("This device is <b>not</b> uploading keys to this backup", {}, {b: x => <b>{x}</b>});
+            }
+            return <div>
+                {_t("Backup version: ")}{this.state.backupInfo.version}<br />
+                {_t("Algorithm: ")}{this.state.backupInfo.algorithm}<br />
+                {clientBackupStatus}<br /><br />
+                <AccessibleButton className="mx_UserSettings_button danger"
+                        onClick={this._deleteBackup}>
+                    { _t("Delete backup") }
+                </AccessibleButton>
+            </div>;
+        } else {
+            return <div>
+                {_t("No backup is present")}<br /><br />
+                <AccessibleButton className="mx_UserSettings_button"
+                        onClick={this._startNewBackup}>
+                    { _t("Start a new backup") }
+                </AccessibleButton>
+            </div>;
+        }
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4643d4bdff..16695c8ec8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -216,6 +216,7 @@
     "Failed to join room": "Failed to join room",
     "Message Pinning": "Message Pinning",
     "Increase performance by only loading room members on first view": "Increase performance by only loading room members on first view",
+    "Backup of encryption keys to server": "Backup of encryption keys to server",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Hide removed messages": "Hide removed messages",
@@ -297,6 +298,16 @@
     "Failed to set display name": "Failed to set display name",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
+    "Delete Backup": "Delete Backup",
+    "Delete your backed up encryption keys from the server? You will no longer be able to use your recovery key to read encrypted message history": "Delete your backed up encryption keys from the server? You will no longer be able to use your recovery key to read encrypted message history",
+    "Delete backup": "Delete backup",
+    "Unable to load key backup status": "Unable to load key backup status",
+    "This device is uploading keys to this backup": "This device is uploading keys to this backup",
+    "This device is <b>not</b> uploading keys to this backup": "This device is <b>not</b> uploading keys to this backup",
+    "Backup version: ": "Backup version: ",
+    "Algorithm: ": "Algorithm: ",
+    "No backup is present": "No backup is present",
+    "Start a new backup": "Start a new backup",
     "Error saving email notification preferences": "Error saving email notification preferences",
     "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
     "Keywords": "Keywords",
@@ -931,6 +942,27 @@
     "Room contains unknown devices": "Room contains unknown devices",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contains devices that you haven't seen before.",
     "Unknown devices": "Unknown devices",
+    "Generate recovery key": "Generate recovery key",
+    "I'll stick to manual backups": "I'll stick to manual backups",
+    "Here is your recovery key:": "Here is your recovery key:",
+    "This key can decrypt your full message history.": "This key can decrypt your full message history.",
+    "When you've saved it somewhere safe, proceed to the next step where the key will be used to create an encrypted backup of your message keys and then destroyed.": "When you've saved it somewhere safe, proceed to the next step where the key will be used to create an encrypted backup of your message keys and then destroyed.",
+    "Copy to clipboard": "Copy to clipboard",
+    "Proceed": "Proceed",
+    "Backup created": "Backup created",
+    "Your encryption keys are now being backed up to your Homeserver.": "Your encryption keys are now being backed up to your Homeserver.",
+    "Unable to create key backup": "Unable to create key backup",
+    "Retry": "Retry",
+    "Generating recovery key...": "Generating recovery key...",
+    "Creating backup...": "Creating backup...",
+    "Uploading keys...": "Uploading keys...",
+    "Create Key Backup": "Create Key Backup",
+    "Backup encryption keys on your server?": "Backup encryption keys on your server?",
+    "Generate recovery key and enable online backups": "Generate recovery key and enable online backups",
+    "Restore encryption keys": "Restore encryption keys",
+    "Verify this device": "Verify this device",
+    "Restore from online backup": "Restore from online backup",
+    "Restore from offline backup": "Restore from offline backup",
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
     "Custom": "Custom",
@@ -1124,6 +1156,7 @@
     "Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
     "<not supported>": "<not supported>",
     "Import E2E room keys": "Import E2E room keys",
+    "Key Backup": "Key Backup",
     "Cryptography": "Cryptography",
     "Device ID:": "Device ID:",
     "Device key:": "Device key:",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 0594c63eb9..3e0c374c8a 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -90,6 +90,12 @@ export const SETTINGS = {
         controller: new LazyLoadingController(),
         default: false,
     },
+    "feature_keybackup": {
+        isFeature: true,
+        displayName: _td("Backup of encryption keys to server"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),

From d94553bafc09c531f18c5cc61e4b953b96b22d0e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 14 Sep 2018 17:08:02 +0100
Subject: [PATCH 005/218] UI for whether the key backup is enabled or not

---
 res/css/_components.scss                      |  1 +
 res/css/views/settings/_KeyBackupPanel.scss   | 32 +++++++++
 .../views/settings/KeyBackupPanel.js          | 67 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                   | 15 +++--
 4 files changed, 108 insertions(+), 7 deletions(-)
 create mode 100644 res/css/views/settings/_KeyBackupPanel.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index e8a8877d62..6ce8d6efa9 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -109,6 +109,7 @@
 @import "./views/rooms/_TopUnreadMessagesBar.scss";
 @import "./views/settings/_DevicesPanel.scss";
 @import "./views/settings/_IntegrationsManager.scss";
+@import "./views/settings/_KeyBackupPanel.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/voip/_CallView.scss";
 @import "./views/voip/_IncomingCallbox.scss";
diff --git a/res/css/views/settings/_KeyBackupPanel.scss b/res/css/views/settings/_KeyBackupPanel.scss
new file mode 100644
index 0000000000..1bcc0ab10d
--- /dev/null
+++ b/res/css/views/settings/_KeyBackupPanel.scss
@@ -0,0 +1,32 @@
+/*
+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.
+*/
+
+.mx_KeyBackupPanel_sigValid, .mx_KeyBackupPanel_sigInvalid,
+.mx_KeyBackupPanel_deviceVerified, .mx_KeyBackupPanel_deviceNotVerified {
+    font-weight: bold;
+}
+
+.mx_KeyBackupPanel_sigValid, .mx_KeyBackupPanel_deviceVerified {
+    color: $e2e-verified-color;
+}
+
+.mx_KeyBackupPanel_sigInvalid, .mx_KeyBackupPanel_deviceNotVerified {
+    color: $e2e-warning-color;
+}
+
+.mx_KeyBackupPanel_deviceName {
+    font-style: italic;
+}
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 3b452e77f8..1794b94792 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -28,6 +28,8 @@ export default class KeyBackupPanel extends React.Component {
 
         this._startNewBackup = this._startNewBackup.bind(this);
         this._deleteBackup = this._deleteBackup.bind(this);
+        this._verifyDevice = this._verifyDevice.bind(this);
+        this._onKeyBackupStatus = this._onKeyBackupStatus.bind(this);
 
         this._unmounted = false;
         this.state = {
@@ -35,20 +37,33 @@ export default class KeyBackupPanel extends React.Component {
             error: null,
             backupInfo: null,
         };
+    }
+
+    componentWillMount() {
         this._loadBackupStatus();
+
+        MatrixClientPeg.get().on('keyBackupStatus', this._onKeyBackupStatus);
     }
 
     componentWillUnmount() {
         this._unmounted = true;
+
+        MatrixClientPeg.get().removeListener('keyBackupStatus', this._onKeyBackupStatus);
+    }
+
+    _onKeyBackupStatus() {
+        this._loadBackupStatus();
     }
 
     async _loadBackupStatus() {
         this.setState({loading: true});
         try {
             const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            const backupSigStatus = await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo);
             if (this._unmounted) return;
             this.setState({
                 backupInfo,
+                backupSigStatus,
                 loading: false,
             });
         } catch (e) {
@@ -92,6 +107,19 @@ export default class KeyBackupPanel extends React.Component {
         
     }
 
+    _verifyDevice(e) {
+        const device = this.state.backupSigStatus.sigs[e.target.getAttribute('data-sigindex')].device;
+
+        const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+        Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, {
+            userId: MatrixClientPeg.get().credentials.userId,
+            device: device,
+            onFinished: () => {
+                this._loadBackupStatus();
+            },
+        });
+    }
+
     render() {
         const Spinner = sdk.getComponent("elements.Spinner");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
@@ -112,10 +140,47 @@ export default class KeyBackupPanel extends React.Component {
                 // XXX: display why and how to fix it
                 clientBackupStatus = _t("This device is <b>not</b> uploading keys to this backup", {}, {b: x => <b>{x}</b>});
             }
+
+            let backupSigStatuses = this.state.backupSigStatus.sigs.map((sig, i) => {
+                const sigStatSub = {
+                    validity: sub => <span className={sig.valid ? 'mx_KeyBackupPanel_sigValid' : 'mx_KeyBackupPanel_sigInvalid'}>{sub}</span>,
+                    verify: sub => <span className={sig.device.isVerified() ? 'mx_KeyBackupPanel_deviceVerified' : 'mx_KeyBackupPanel_deviceNotVerified'}>{sub}</span>,
+                    device: sub => <span className="mx_KeyBackupPanel_deviceName">{sig.device.getDisplayName()}</span>,
+                };
+                let sigStat;
+                if (sig.valid && sig.device.isVerified()) {
+                    sigStat = _t("Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device>x</device>", {}, sigStatSub);
+                } else if (sig.valid && !sig.device.isVerified()) {
+                    sigStat = _t("Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>", {}, sigStatSub);
+                } else if (!sig.valid && sig.device.isVerified()) {
+                    sigStat = _t("Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>", {}, sigStatSub);
+                } else if (!sig.valid && !sig.device.isVerified()) {
+                    sigStat = _t("Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>", {}, sigStatSub);
+                }
+
+                let verifyButton;
+                if (!sig.device.isVerified()) {
+                    verifyButton = <div><br /><AccessibleButton className="mx_UserSettings_button"
+                            onClick={this._verifyDevice} data-sigindex={i}>
+                        { _t("Verify...") }
+                    </AccessibleButton></div>;
+                }
+
+                return <div key={i}>
+                    {sigStat}
+                    {verifyButton}
+                </div>;
+            });
+            if (this.state.backupSigStatus.sigs.length === 0) {
+                backupSigStatuses = _t("Backup is not signed by any of your devices");
+            }
+
             return <div>
                 {_t("Backup version: ")}{this.state.backupInfo.version}<br />
                 {_t("Algorithm: ")}{this.state.backupInfo.algorithm}<br />
-                {clientBackupStatus}<br /><br />
+                {clientBackupStatus}<br />
+                <div>{backupSigStatuses}</div><br />
+                <br />
                 <AccessibleButton className="mx_UserSettings_button danger"
                         onClick={this._deleteBackup}>
                     { _t("Delete backup") }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 16695c8ec8..acad2b7e33 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -304,6 +304,11 @@
     "Unable to load key backup status": "Unable to load key backup status",
     "This device is uploading keys to this backup": "This device is uploading keys to this backup",
     "This device is <b>not</b> uploading keys to this backup": "This device is <b>not</b> uploading keys to this backup",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device>x</device>": "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device>x</device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>",
+    "Backup is not signed by any of your devices": "Backup is not signed by any of your devices",
     "Backup version: ": "Backup version: ",
     "Algorithm: ": "Algorithm: ",
     "No backup is present": "No backup is present",
@@ -937,6 +942,10 @@
     "Share Room Message": "Share Room Message",
     "Link to selected message": "Link to selected message",
     "COPY": "COPY",
+    "Restore encryption keys": "Restore encryption keys",
+    "Verify this device": "Verify this device",
+    "Restore from online backup": "Restore from online backup",
+    "Restore from offline backup": "Restore from offline backup",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
     "Room contains unknown devices": "Room contains unknown devices",
@@ -957,12 +966,6 @@
     "Creating backup...": "Creating backup...",
     "Uploading keys...": "Uploading keys...",
     "Create Key Backup": "Create Key Backup",
-    "Backup encryption keys on your server?": "Backup encryption keys on your server?",
-    "Generate recovery key and enable online backups": "Generate recovery key and enable online backups",
-    "Restore encryption keys": "Restore encryption keys",
-    "Verify this device": "Verify this device",
-    "Restore from online backup": "Restore from online backup",
-    "Restore from offline backup": "Restore from offline backup",
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
     "Custom": "Custom",

From 2e6d27717cdd17310beb72e77e973ca3fa541408 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 14 Sep 2018 17:33:25 +0100
Subject: [PATCH 006/218] LIIIIIIIIIIIIIIIINT!

---
 .../views/dialogs/SuggestKeyRestoreDialog.js  |  3 +-
 .../keybackup/CreateKeyBackupDialog.js        |  4 +-
 .../views/settings/KeyBackupPanel.js          | 43 ++++++++++++++-----
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/components/views/dialogs/SuggestKeyRestoreDialog.js b/src/components/views/dialogs/SuggestKeyRestoreDialog.js
index 3419b6235c..993bc74666 100644
--- a/src/components/views/dialogs/SuggestKeyRestoreDialog.js
+++ b/src/components/views/dialogs/SuggestKeyRestoreDialog.js
@@ -14,12 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Modal from '../../../Modal';
 import React from 'react';
 import PropTypes from 'prop-types';
 import sdk from '../../../index';
 
-import { _t, _td } from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
 
 /**
  * Dialog which asks the user whether they want to restore megolm keys
diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 03410f4f7d..6e83e4c032 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Modal from '../../../../Modal';
 import React from 'react';
-import PropTypes from 'prop-types';
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 import { formatCryptoKey } from '../../../../utils/FormattingUtils';
@@ -146,7 +144,7 @@ export default React.createClass({
             <p>{_t("This key can decrypt your full message history.")}</p>
             <p>{_t(
                 "When you've saved it somewhere safe, proceed to the next step where the key will be used to "+
-                "create an encrypted backup of your message keys and then destroyed."
+                "create an encrypted backup of your message keys and then destroyed.",
             )}</p>
             <div className="mx_Dialog_buttons">
                 <button onClick={this._copyRecoveryKey}>
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 1794b94792..26a8d761c8 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -92,7 +91,7 @@ export default class KeyBackupPanel extends React.Component {
             title: _t("Delete Backup"),
             description: _t(
                 "Delete your backed up encryption keys from the server? " +
-                "You will no longer be able to use your recovery key to read encrypted message history"
+                "You will no longer be able to use your recovery key to read encrypted message history",
             ),
             button: _t('Delete backup'),
             danger: true,
@@ -104,7 +103,6 @@ export default class KeyBackupPanel extends React.Component {
                 });
             },
         });
-        
     }
 
     _verifyDevice(e) {
@@ -138,24 +136,49 @@ export default class KeyBackupPanel extends React.Component {
                 clientBackupStatus = _t("This device is uploading keys to this backup");
             } else {
                 // XXX: display why and how to fix it
-                clientBackupStatus = _t("This device is <b>not</b> uploading keys to this backup", {}, {b: x => <b>{x}</b>});
+                clientBackupStatus = _t(
+                    "This device is <b>not</b> uploading keys to this backup", {},
+                    {b: x => <b>{x}</b>},
+                );
             }
 
             let backupSigStatuses = this.state.backupSigStatus.sigs.map((sig, i) => {
                 const sigStatSub = {
-                    validity: sub => <span className={sig.valid ? 'mx_KeyBackupPanel_sigValid' : 'mx_KeyBackupPanel_sigInvalid'}>{sub}</span>,
-                    verify: sub => <span className={sig.device.isVerified() ? 'mx_KeyBackupPanel_deviceVerified' : 'mx_KeyBackupPanel_deviceNotVerified'}>{sub}</span>,
+                    validity: sub =>
+                        <span className={sig.valid ? 'mx_KeyBackupPanel_sigValid' : 'mx_KeyBackupPanel_sigInvalid'}>
+                            {sub}
+                        </span>,
+                    verify: sub =>
+                        <span className={sig.device.isVerified() ? 'mx_KeyBackupPanel_deviceVerified' : 'mx_KeyBackupPanel_deviceNotVerified'}>
+                            {sub}
+                        </span>,
                     device: sub => <span className="mx_KeyBackupPanel_deviceName">{sig.device.getDisplayName()}</span>,
                 };
                 let sigStat;
                 if (sig.valid && sig.device.isVerified()) {
-                    sigStat = _t("Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device>x</device>", {}, sigStatSub);
+                    sigStat = _t(
+                        "Backup has a <validity>valid</validity> signature from " +
+                        "<verify>verified</verify> device <device>x</device>",
+                        {}, sigStatSub,
+                    );
                 } else if (sig.valid && !sig.device.isVerified()) {
-                    sigStat = _t("Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>", {}, sigStatSub);
+                    sigStat = _t(
+                        "Backup has a <validity>valid</validity> signature from " +
+                        "<verify>unverified</verify> device <device></device>",
+                        {}, sigStatSub,
+                    );
                 } else if (!sig.valid && sig.device.isVerified()) {
-                    sigStat = _t("Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>", {}, sigStatSub);
+                    sigStat = _t(
+                        "Backup has an <validity>invalid</validity> signature from " +
+                        "<verify>verified</verify> device <device></device>",
+                        {}, sigStatSub,
+                    );
                 } else if (!sig.valid && !sig.device.isVerified()) {
-                    sigStat = _t("Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>", {}, sigStatSub);
+                    sigStat = _t(
+                        "Backup has an <validity>invalid</validity> signature from " +
+                        "<verify>unverified</verify> device <device></device>",
+                        {}, sigStatSub,
+                    );
                 }
 
                 let verifyButton;

From 9a65e6817a55fcf111c33be15bdacea9e97a0023 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 17 Sep 2018 16:00:23 +0100
Subject: [PATCH 007/218] Support restoring key backup

---
 .../keybackup/RestoreKeyBackupDialog.js       | 156 ++++++++++++++++++
 .../views/settings/KeyBackupPanel.js          |  15 +-
 src/i18n/strings/en_EN.json                   |  11 +-
 3 files changed, 180 insertions(+), 2 deletions(-)
 create mode 100644 src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
new file mode 100644
index 0000000000..a0451a9201
--- /dev/null
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -0,0 +1,156 @@
+/*
+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 Modal from '../../../../Modal';
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../../index';
+import MatrixClientPeg from '../../../../MatrixClientPeg';
+import { formatCryptoKey } from '../../../../utils/FormattingUtils';
+import Promise from 'bluebird';
+
+import { _t, _td } from '../../../../languageHandler';
+
+/**
+ * Dialog for restoring e2e keys from a backup and the user's recovery key
+ */
+export default React.createClass({
+    getInitialState: function() {
+        return {
+            backupInfo: null,
+            loading: false,
+            loadError: null,
+            restoreError: null,
+            recoveryKey: "",
+            recoverInfo: null,
+        };
+    },
+
+    componentWillMount: function() {
+        this._loadBackupStatus();
+    },
+
+    _onCancel: function() {
+        this.props.onFinished(false);
+    },
+
+    _onDone: function() {
+        this.props.onFinished(true);
+    },
+
+    _onRecoveryKeyChange: function(e) {
+        this.setState({recoveryKey: e.target.value});
+    },
+
+    _onRecoverClick: async function() {
+        this.setState({
+            loading: true,
+            restoreError: null,
+        });
+        try {
+            const recoverInfo = await MatrixClientPeg.get().restoreKeyBackups(
+                this.state.recoveryKey.replace(/ /g, ''), undefined, undefined, this.state.backupInfo.version,
+            );
+            this.setState({
+                loading: false,
+                recoverInfo,
+            });
+        } catch (e) {
+            console.log("Error restoring backup", e);
+            this.setState({
+                loading: false,
+                restoreError: e,
+            });
+        }
+    },
+
+    _loadBackupStatus: async function() {
+        this.setState({
+            loading: true,
+            loadError: null,
+        });
+        try {
+            const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            this.setState({
+                loadError: null,
+                loading: false,
+                backupInfo,
+            });
+        } catch (e) {
+            console.log("Error loading backup status", e);
+            this.setState({
+                loadError: e,
+                loading: false,
+            });
+        }
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const Spinner = sdk.getComponent("elements.Spinner");
+
+        let content;
+        if (this.state.loading) {
+            content = <Spinner />;
+        } else if (this.state.loadError) {
+            content = _t("Unable to load backup status");
+        } else if (this.state.restoreError) {
+            content = _t("Unable to restore backup");
+        } else if (this.state.backupInfo === null) {
+            content = _t("No backup found!");
+        } else if (this.state.recoverInfo) {
+            let failedToDecrypt;
+            if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
+                failedToDecrypt = <p>{_t(
+                    "Failed to decrypt %(failedCount)s sessions!",
+                    {failedCount: this.state.recoverInfo.total - this.state.recoverInfo.imported},
+                )}</p>;
+            }
+            content = <div>
+                <p>{_t("Restored %(sessionCount)s session keys", {sessionCount: this.state.recoverInfo.imported})}</p>
+                {failedToDecrypt}
+            </div>;
+        } else {
+            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+            content = <div>
+                {_t("Please enter the recovery key generated when you set up key backup")}<br />
+                <textarea 
+                    onChange={this._onRecoveryKeyChange}
+                    value={this.state.recoveryKey}
+                    style={{width: "90%"}}
+                    autoFocus={true}
+                />
+                <DialogButtons primaryButton={_t('Recover')}
+                    onPrimaryButtonClick={this._onRecoverClick}
+                    hasCancel={true}
+                    onCancel={this._onCancel}
+                    focus={false}
+                />
+            </div>;
+        }
+
+        return (
+            <BaseDialog className='mx_RestoreKeyBackupDialog'
+                onFinished={this.props.onFinished}
+                title={_t('Restore Key Backup')}
+            >
+            <div>
+                {content}
+            </div>
+            </BaseDialog>
+        );
+    },
+});
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 26a8d761c8..ebf9daf0d2 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -29,6 +29,7 @@ export default class KeyBackupPanel extends React.Component {
         this._deleteBackup = this._deleteBackup.bind(this);
         this._verifyDevice = this._verifyDevice.bind(this);
         this._onKeyBackupStatus = this._onKeyBackupStatus.bind(this);
+        this._restoreBackup = this._restoreBackup.bind(this);
 
         this._unmounted = false;
         this.state = {
@@ -47,7 +48,9 @@ export default class KeyBackupPanel extends React.Component {
     componentWillUnmount() {
         this._unmounted = true;
 
-        MatrixClientPeg.get().removeListener('keyBackupStatus', this._onKeyBackupStatus);
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('keyBackupStatus', this._onKeyBackupStatus);
+        }
     }
 
     _onKeyBackupStatus() {
@@ -105,6 +108,12 @@ export default class KeyBackupPanel extends React.Component {
         });
     }
 
+    _restoreBackup() {
+        const RestoreKeyBackupDialog = sdk.getComponent("dialogs.keybackup.RestoreKeyBackupDialog");
+        Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {
+        });
+    }
+
     _verifyDevice(e) {
         const device = this.state.backupSigStatus.sigs[e.target.getAttribute('data-sigindex')].device;
 
@@ -204,6 +213,10 @@ export default class KeyBackupPanel extends React.Component {
                 {clientBackupStatus}<br />
                 <div>{backupSigStatuses}</div><br />
                 <br />
+                <AccessibleButton className="mx_UserSettings_button"
+                        onClick={this._restoreBackup}>
+                    { _t("Restore backup") }
+                </AccessibleButton>&nbsp;&nbsp;&nbsp;
                 <AccessibleButton className="mx_UserSettings_button danger"
                         onClick={this._deleteBackup}>
                     { _t("Delete backup") }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index acad2b7e33..1be2845787 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -308,9 +308,11 @@
     "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>",
+    "Verify...": "Verify...",
     "Backup is not signed by any of your devices": "Backup is not signed by any of your devices",
     "Backup version: ": "Backup version: ",
     "Algorithm: ": "Algorithm: ",
+    "Restore backup": "Restore backup",
     "No backup is present": "No backup is present",
     "Start a new backup": "Start a new backup",
     "Error saving email notification preferences": "Error saving email notification preferences",
@@ -742,7 +744,6 @@
     "Unblacklist": "Unblacklist",
     "Blacklist": "Blacklist",
     "Unverify": "Unverify",
-    "Verify...": "Verify...",
     "No results": "No results",
     "Delete": "Delete",
     "Communities": "Communities",
@@ -966,6 +967,14 @@
     "Creating backup...": "Creating backup...",
     "Uploading keys...": "Uploading keys...",
     "Create Key Backup": "Create Key Backup",
+    "Unable to load backup status": "Unable to load backup status",
+    "Unable to restore backup": "Unable to restore backup",
+    "No backup found!": "No backup found!",
+    "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
+    "Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
+    "Please enter the recovery key generated when you set up key backup": "Please enter the recovery key generated when you set up key backup",
+    "Recover": "Recover",
+    "Restore Key Backup": "Restore Key Backup",
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
     "Custom": "Custom",

From f507aac3d5df691acf2326d33c27406b75af2010 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 17 Sep 2018 17:05:29 +0100
Subject: [PATCH 008/218] Show if recovery key is valid

---
 res/css/_components.scss                      |  1 +
 .../dialogs/_RestoreKeyBackupDialog.scss      | 19 ++++++++++++++
 .../keybackup/RestoreKeyBackupDialog.js       | 26 ++++++++++++++++++-
 .../views/elements/DialogButtons.js           |  6 ++++-
 src/i18n/strings/en_EN.json                   |  2 ++
 5 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 res/css/views/dialogs/_RestoreKeyBackupDialog.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 6ce8d6efa9..be140b2de7 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -40,6 +40,7 @@
 @import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_QuestionDialog.scss";
+@import "./views/dialogs/_RestoreKeyBackupDialog.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_SetEmailDialog.scss";
 @import "./views/dialogs/_SetMxIdDialog.scss";
diff --git a/res/css/views/dialogs/_RestoreKeyBackupDialog.scss b/res/css/views/dialogs/_RestoreKeyBackupDialog.scss
new file mode 100644
index 0000000000..69e00c416a
--- /dev/null
+++ b/res/css/views/dialogs/_RestoreKeyBackupDialog.scss
@@ -0,0 +1,19 @@
+/*
+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.
+*/
+
+.mx_RestoreKeyBackupDialog_keyStatus {
+    height: 30px;
+}
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index a0451a9201..5c02fd1227 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -24,6 +24,10 @@ import Promise from 'bluebird';
 
 import { _t, _td } from '../../../../languageHandler';
 
+function isRecoveryKeyValid(r) {
+    return MatrixClientPeg.get().isValidRecoveryKey(r.replace(/ /g, ''));
+}
+
 /**
  * Dialog for restoring e2e keys from a backup and the user's recovery key
  */
@@ -36,6 +40,7 @@ export default React.createClass({
             restoreError: null,
             recoveryKey: "",
             recoverInfo: null,
+            recoveryKeyValid: false,
         };
     },
 
@@ -52,7 +57,10 @@ export default React.createClass({
     },
 
     _onRecoveryKeyChange: function(e) {
-        this.setState({recoveryKey: e.target.value});
+        this.setState({
+            recoveryKey: e.target.value,
+            recoveryKeyValid: isRecoveryKeyValid(e.target.value),
+        });
     },
 
     _onRecoverClick: async function() {
@@ -125,6 +133,20 @@ export default React.createClass({
             </div>;
         } else {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+
+            let keyStatus;
+            if (this.state.recoveryKey.length === 0) {
+                keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus"></div>;
+            } else if (this.state.recoveryKeyValid) {
+                keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus">
+                    {"\uD83D\uDC4D "}{_t("This looks like a valid recovery key!")}
+                </div>;
+            } else {
+                keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus">
+                    {"\uD83D\uDC4E "}{_t("Not a valid recovery key")}
+                </div>;
+            }
+
             content = <div>
                 {_t("Please enter the recovery key generated when you set up key backup")}<br />
                 <textarea 
@@ -133,11 +155,13 @@ export default React.createClass({
                     style={{width: "90%"}}
                     autoFocus={true}
                 />
+                {keyStatus}
                 <DialogButtons primaryButton={_t('Recover')}
                     onPrimaryButtonClick={this._onRecoverClick}
                     hasCancel={true}
                     onCancel={this._onCancel}
                     focus={false}
+                    primaryDisabled={!this.state.recoveryKeyValid}
                 />
             </div>;
         }
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index baf831415f..e8e1c78e71 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -43,7 +43,11 @@ module.exports = React.createClass({
 
         focus: PropTypes.bool,
 
+        // disables the primary and cancel buttons
         disabled: PropTypes.bool,
+
+        // disables only the primary button
+        primaryDisabled: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -73,7 +77,7 @@ module.exports = React.createClass({
                 <button className={primaryButtonClassName}
                     onClick={this.props.onPrimaryButtonClick}
                     autoFocus={this.props.focus}
-                    disabled={this.props.disabled}
+                    disabled={this.props.disabled || this.props.primaryDisabled}
                 >
                     { this.props.primaryButton }
                 </button>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1be2845787..511b007eca 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -972,6 +972,8 @@
     "No backup found!": "No backup found!",
     "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
     "Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
+    "This looks like a valid recovery key!": "This looks like a valid recovery key!",
+    "Not a valid recovery key": "Not a valid recovery key",
     "Please enter the recovery key generated when you set up key backup": "Please enter the recovery key generated when you set up key backup",
     "Recover": "Recover",
     "Restore Key Backup": "Restore Key Backup",

From 12d10cccefb606a7b57ecec89a101cc17c47fdb7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 17 Sep 2018 17:14:03 +0100
Subject: [PATCH 009/218] Show if sig is from this device

---
 src/components/views/settings/KeyBackupPanel.js | 7 ++++++-
 src/i18n/strings/en_EN.json                     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index ebf9daf0d2..7cbee9c501 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -164,7 +164,12 @@ export default class KeyBackupPanel extends React.Component {
                     device: sub => <span className="mx_KeyBackupPanel_deviceName">{sig.device.getDisplayName()}</span>,
                 };
                 let sigStat;
-                if (sig.valid && sig.device.isVerified()) {
+                if (sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key()) {
+                    sigStat = _t(
+                        "Backup has a <validity>valid</validity> signature from this device",
+                        {}, sigStatSub,
+                    );
+                } else if (sig.valid && sig.device.isVerified()) {
                     sigStat = _t(
                         "Backup has a <validity>valid</validity> signature from " +
                         "<verify>verified</verify> device <device>x</device>",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 511b007eca..300a1f67cf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -304,6 +304,7 @@
     "Unable to load key backup status": "Unable to load key backup status",
     "This device is uploading keys to this backup": "This device is uploading keys to this backup",
     "This device is <b>not</b> uploading keys to this backup": "This device is <b>not</b> uploading keys to this backup",
+    "Backup has a <validity>valid</validity> signature from this device": "Backup has a <validity>valid</validity> signature from this device",
     "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device>x</device>": "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device>x</device>",
     "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>",

From 2cef0f7f727e9237759bb82f4264f24e41786d06 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 18 Sep 2018 15:04:51 +0100
Subject: [PATCH 010/218] lint

---
 src/SuggestKeyRestoreHandler.js               | 96 -------------------
 .../views/dialogs/SuggestKeyRestoreDialog.js  | 76 ---------------
 .../keybackup/RestoreKeyBackupDialog.js       |  8 +-
 3 files changed, 2 insertions(+), 178 deletions(-)
 delete mode 100644 src/SuggestKeyRestoreHandler.js
 delete mode 100644 src/components/views/dialogs/SuggestKeyRestoreDialog.js

diff --git a/src/SuggestKeyRestoreHandler.js b/src/SuggestKeyRestoreHandler.js
deleted file mode 100644
index 3383889c1e..0000000000
--- a/src/SuggestKeyRestoreHandler.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-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 sdk from './index';
-import Modal from './Modal';
-
-export default class SuggestKeyRestoreHandler {
-    constructor(matrixClient) {
-        this._matrixClient = matrixClient;
-    }
-
-    handleSuggestKeyRestore() {
-        const onVerifyDevice = () => {
-            const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
-
-            Modal.createTrackedDialog('Key Restore', 'Starting verification', DeviceVerifyDialog, {
-                // userId: this.props.userId,
-                // device: this.state.deviceInfo,
-                onFinished: (verified) => {
-                    if (verified) {
-                        this.props.onFinished();
-                    }
-                },
-            });
-        };
-
-        const onRecoverFromBackup = () => {
-             // XXX: we need this so that you can get at it from UserSettings too
-             // * prompt for recovery key
-             // * Download the current backup version info from the server and check the key decrypts it okay.
-             // * Check that the public key for that backup version matches the recovery key
-             // * show a spinner
-             // * Download all the existing keys from the server
-             // * Decrypt them using the recovery key
-             // * Add them to the local store (which encrypts them as normal with "DEFAULT KEY"
-             // * Enable incremental backups for this device.
-        };
-
-        const onIgnoreSuggestion = () => {
-        };
-
-        const onFinished = () => {
-            this.suggestBackup();
-        };
-
-        // FIXME: need a way to know if an account has ever touched E2E before.
-        // Perhaps we can extend toDevice to include a flag if it's the first time the
-        // server has ever sent a room_key to a client or something?
-        const virginAccount = false;
-
-        if (virginAccount) {
-            this.suggestBackup();
-            return;
-        }
-
-        const SuggestKeyRestoreDialog = sdk.getComponent("dialogs.SuggestKeyRestoreDialog");
-        Modal.createTrackedDialog('Key Restore', 'Key Restore', SuggestKeyRestoreDialog, {
-            matrixClient: this._matrixClient,
-            isOnlyDevice: false, // FIXME
-            hasOnlineBackup: false, // FIXME
-            onVerifyDevice: onVerifyDevice,
-            onRecoverFromBackup: onRecoverFromBackup,
-            onIgnoreSuggestion: onIgnoreSuggestion,
-            onFinished: onFinished,
-        });
-    }
-
-    suggestBackup() {
-        if (hasOnlineBackup) return;
-
-        const onStartNewBackup = () => {
-          // XXX: we need this so that you can get at it from UserSettings too
-          // * Upload all their existing keys from their session store to the backup using the bulk upload API.
-          //   (Having re-encrypted them using the backup keypair rather than the static one used to store them on disk)
-        };
-
-        const SuggestKeyBackupDialog = sdk.getComponent("dialogs.SuggestKeyBackupDialog");
-        Modal.createTrackedDialog('Key Backup', 'Key Backup', SuggestKeyBackupDialog, {
-            onStartNewBackup: onStartNewBackup,
-        });        
-    }    
-}
-
diff --git a/src/components/views/dialogs/SuggestKeyRestoreDialog.js b/src/components/views/dialogs/SuggestKeyRestoreDialog.js
deleted file mode 100644
index 993bc74666..0000000000
--- a/src/components/views/dialogs/SuggestKeyRestoreDialog.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-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 React from 'react';
-import PropTypes from 'prop-types';
-import sdk from '../../../index';
-
-import { _t } from '../../../languageHandler';
-
-/**
- * Dialog which asks the user whether they want to restore megolm keys
- * from various sources when they first start using E2E on a new device.
- */
-export default React.createClass({
-    propTypes: {
-        matrixClient: PropTypes.object.isRequired,
-        isOnlyDevice: PropTypes.bool.isRequired,
-        hasOnlineBackup: PropTypes.bool.isRequired,
-        onVerifyDevice: PropTypes.func.isRequired,
-        onImportBackup: PropTypes.func.isRequired,
-        onRecoverFromBackup: PropTypes.func.isRequired,
-        onIgnoreSuggestion: PropTypes.func.isRequired,
-    },
-
-    render: function() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-
-        return (
-            <BaseDialog className='mx_SuggestKeyRestoreDialog'
-                onFinished={this.props.onFinished}
-                title={_t('Restore encryption keys')}
-            >
-                <div>
-                    <p>We don't have a way to decrypt older messages on this device.</p>
-
-                    <p>Your options are:</p>
-
-                    <li>
-                        { !this.props.isOnlyDevice ? <ul>Verify this device from one or more of your other ones to automatically sync keys</ul>: '' }
-                        { this.props.hasOnlineBackup ? <ul>Enter your recovery key to restore encryption keys from your online backup</ul> : '' }
-                        <ul>Import encryption keys from an offline backup</ul>
-                        <ul>Continue without restoring keys, syncing keys from your other devices on a best effort basis</ul>
-                    </li>
-
-                    <div className="mx_Dialog_buttons">
-                        <button onClick={this.props.onVerifyDevice}>
-                            { _t('Verify this device') }
-                        </button>
-                        <button onClick={this.props.onRecoverFromBackup}>
-                            { _t('Restore from online backup') }
-                        </button>
-                        <button onClick={this.props.onImportBackup}>
-                            { _t('Restore from offline backup') }
-                        </button>
-                        <button onClick={this.props.onIgnoreClicked}>
-                            { _t('Ignore request') }
-                        </button>
-                    </div>
-                </div>
-            </BaseDialog>
-        );
-    },
-});
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 5c02fd1227..149f6a6d1f 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -14,15 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Modal from '../../../../Modal';
 import React from 'react';
-import PropTypes from 'prop-types';
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
-import { formatCryptoKey } from '../../../../utils/FormattingUtils';
-import Promise from 'bluebird';
 
-import { _t, _td } from '../../../../languageHandler';
+import { _t } from '../../../../languageHandler';
 
 function isRecoveryKeyValid(r) {
     return MatrixClientPeg.get().isValidRecoveryKey(r.replace(/ /g, ''));
@@ -149,7 +145,7 @@ export default React.createClass({
 
             content = <div>
                 {_t("Please enter the recovery key generated when you set up key backup")}<br />
-                <textarea 
+                <textarea
                     onChange={this._onRecoveryKeyChange}
                     value={this.state.recoveryKey}
                     style={{width: "90%"}}

From 5ba45a71e8351af8ef9919964ca03a6a0080ff95 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 18 Sep 2018 15:32:33 +0100
Subject: [PATCH 011/218] Remove SuggestKeyRestoreHandler

Didn't end up using it for this iteration
---
 src/components/structures/MatrixChat.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 900cd57b90..457e5dda77 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -48,8 +48,6 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
 
-import SuggestKeyRestoreHandler from "../../SuggestKeyRestoreHandler";
-
 /** constants for MatrixChat.state.view */
 const VIEWS = {
     // a special initial state which is only used at startup, while we are
@@ -1361,11 +1359,6 @@ export default React.createClass({
             krh.handleKeyRequestCancellation(req);
         });
 
-        const skrh = new SuggestKeyRestoreHandler(cli);
-        cli.on("crypto.suggestKeyRestore", () => {
-            skrh.handleSuggestKeyRestore();
-        });
-
         cli.on("Room", (room) => {
             if (MatrixClientPeg.get().isCryptoEnabled()) {
                 const blacklistEnabled = SettingsStore.getValueAt(

From 56808077d07c14ec89fee9ef7a07d40e037b82d0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 2 Oct 2018 19:24:39 +0100
Subject: [PATCH 012/218] js-sdk now handle recovery key formatting

---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 6e83e4c032..4bb1f31558 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
-import { formatCryptoKey } from '../../../../utils/FormattingUtils';
 import Promise from 'bluebird';
 
 import { _t, _td } from '../../../../languageHandler';
@@ -139,7 +138,7 @@ export default React.createClass({
         return <div>
             <p>{_t("Here is your recovery key:")}</p>
             <p className="mx_CreateKeyBackupDialog_recoveryKey">
-                <code ref={this._collectRecoveryKeyNode}>{formatCryptoKey(this._keyBackupInfo.recovery_key)}</code>
+                <code ref={this._collectRecoveryKeyNode}>{this._keyBackupInfo.recovery_key}</code>
             </p>
             <p>{_t("This key can decrypt your full message history.")}</p>
             <p>{_t(

From 849f0f796a181f31be23aee7cb9af1d88e7e99ae Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 Oct 2018 12:02:50 +0100
Subject: [PATCH 013/218] js-sdk now handles recovery key formatting

---
 .../views/dialogs/keybackup/RestoreKeyBackupDialog.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 149f6a6d1f..1dc927055d 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -66,7 +66,7 @@ export default React.createClass({
         });
         try {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackups(
-                this.state.recoveryKey.replace(/ /g, ''), undefined, undefined, this.state.backupInfo.version,
+                this.state.recoveryKey, undefined, undefined, this.state.backupInfo.version,
             );
             this.setState({
                 loading: false,

From 67e8a6f9dc329c355081fe894b620f137cb56f39 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 9 Oct 2018 14:01:58 +0100
Subject: [PATCH 014/218] Recovery key formatting is now done by the js-sdk

---
 .../views/dialogs/keybackup/RestoreKeyBackupDialog.js       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 1dc927055d..9e5e61cb1a 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -20,10 +20,6 @@ import MatrixClientPeg from '../../../../MatrixClientPeg';
 
 import { _t } from '../../../../languageHandler';
 
-function isRecoveryKeyValid(r) {
-    return MatrixClientPeg.get().isValidRecoveryKey(r.replace(/ /g, ''));
-}
-
 /**
  * Dialog for restoring e2e keys from a backup and the user's recovery key
  */
@@ -55,7 +51,7 @@ export default React.createClass({
     _onRecoveryKeyChange: function(e) {
         this.setState({
             recoveryKey: e.target.value,
-            recoveryKeyValid: isRecoveryKeyValid(e.target.value),
+            recoveryKeyValid: MatrixClientPeg.get().isValidRecoveryKey(e.target.value),
         });
     },
 

From ebcc65dc7eafa4ab0d45558464f1cce65de9fb6f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Oct 2018 13:52:58 -0600
Subject: [PATCH 015/218] Apply the user's tint once the MatrixClientPeg is
 moderately ready

Any earlier and we risk getting NPEs from the peg not existing.

Fixes https://github.com/vector-im/riot-web/issues/6424
---
 src/MatrixClientPeg.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index f02c751a2c..3fca482aba 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -26,6 +26,7 @@ import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
+import Tinter from "./Tinter";
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -128,6 +129,9 @@ class MatrixClientPeg {
             opts.lazyLoadMembers = true;
         }
 
+        const color_scheme = SettingsStore.getValue("roomColor");
+        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
+
         // Connect the matrix client to the dispatcher
         MatrixActionCreators.start(this.matrixClient);
 

From 3d8f0adf56d0bd0607d6ad553c47cf915a87cf95 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Oct 2018 14:35:54 -0600
Subject: [PATCH 016/218] Move pinned rooms check to the RoomListStore

---
 src/components/structures/RoomSubList.js | 20 +------------------
 src/stores/RoomListStore.js              | 25 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 6aaa875e48..d798070659 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -19,7 +19,6 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 import sdk from '../../index';
-import SettingsStore from "../../settings/SettingsStore";
 import { Droppable } from 'react-beautiful-dnd';
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
@@ -100,10 +99,8 @@ const RoomSubList = React.createClass({
     componentWillReceiveProps: function(newProps) {
         // order the room list appropriately before we re-render
         //if (debug) console.log("received new props, list = " + newProps.list);
-        const filteredRooms = this.applySearchFilter(newProps.list, newProps.searchFilter);
-        const sortedRooms = newProps.order === "recent" ? this.applyPinnedTileRules(filteredRooms) : filteredRooms;
         this.setState({
-            sortedList: sortedRooms,
+            sortedList: this.applySearchFilter(newProps.list, newProps.searchFilter),
         });
     },
 
@@ -116,21 +113,6 @@ const RoomSubList = React.createClass({
             (filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))));
     },
 
-    applyPinnedTileRules: function(list) {
-        const pinUnread = SettingsStore.getValue("pinUnreadRooms");
-        const pinMentioned = SettingsStore.getValue("pinMentionedRooms");
-        if (!pinUnread && !pinMentioned) {
-            return list; // Nothing to sort
-        }
-
-        const mentioned = !pinMentioned ? [] : list.filter(room => room.getUnreadNotificationCount("highlight") > 0);
-        const unread = !pinUnread ? [] : list.filter(room => Unread.doesRoomHaveUnreadMessages(room));
-
-        return mentioned
-            .concat(unread.filter(room => !mentioned.find(other => other === room)))
-            .concat(list.filter(room => !unread.find(other => other === room)));
-    },
-
     // The header is collapsable if it is hidden or not stuck
     // The dataset elements are added in the RoomList _initAndPositionStickyHeaders method
     isCollapsableOnClick: function() {
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 67c0c13be7..4c3e10e77f 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -17,6 +17,7 @@ import {Store} from 'flux/utils';
 import dis from '../dispatcher';
 import DMRoomMap from '../utils/DMRoomMap';
 import Unread from '../Unread';
+import SettingsStore from "../settings/SettingsStore";
 
 /**
  * A class for storing application state for categorising rooms in
@@ -263,6 +264,30 @@ class RoomListStore extends Store {
     }
 
     _recentsComparator(roomA, roomB) {
+        const pinUnread = SettingsStore.getValue("pinUnreadRooms");
+        const pinMentioned = SettingsStore.getValue("pinMentionedRooms");
+
+        // We try and set the ordering to be Mentioned > Unread > Recent
+        // assuming the user has the right settings, of course
+
+        if (pinMentioned) {
+             const mentionsA = roomA.getUnreadNotificationCount("highlight") > 0;
+             const mentionsB = roomB.getUnreadNotificationCount("highlight") > 0;
+             if (mentionsA && !mentionsB) return -1;
+             if (!mentionsA && mentionsB) return 1;
+             if (mentionsA && mentionsB) return 0;
+             // If neither have mentions, fall through to remaining checks
+        }
+
+        if (pinUnread) {
+            const unreadA = Unread.doesRoomHaveUnreadMessages(roomA);
+            const unreadB = Unread.doesRoomHaveUnreadMessages(roomB);
+            if (unreadA && !unreadB) return -1;
+            if (!unreadA && unreadB) return 1;
+            if (unreadA && unreadB) return 0;
+            // If neither have unread messages, fall through to remaining checks
+        }
+
         // XXX: We could use a cache here and update it when we see new
         // events that trigger a reorder
         return this._tsOfNewestEvent(roomB) - this._tsOfNewestEvent(roomA);

From b813e3b71479badf13aa8555e3739b85f79f1ad6 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkkx@protonmail.com>
Date: Fri, 12 Oct 2018 16:31:25 +0000
Subject: [PATCH 017/218] Translated using Weblate (Polish)

Currently translated at 89.9% (1140 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 3bbc9b1d73..245ee0c395 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1146,5 +1146,14 @@
     "was invited %(count)s times|one": "został zaproszony",
     "was banned %(count)s times|one": "został zablokowany",
     "was kicked %(count)s times|one": "został wyrzucony",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": ""
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "",
+    "Call in Progress": "Łączenie w toku",
+    "Permission Required": "Wymagane Pozwolenie",
+    "Registration Required": "Wymagana Rejestracja",
+    "You need to register to do this. Would you like to register now?": "Musisz się zarejestrować, aby to zrobić. Czy chcesz się teraz zarejestrować?",
+    "underlined": "podkreślenie",
+    "deleted": "przekreślenie",
+    "numbered-list": "lista numerowana",
+    "bulleted-list": "wykropkowana lista",
+    "block-quote": "blok cytowany"
 }

From 127fcf58a998158dae3899418dd96e1bfbc1f2e7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 15 Oct 2018 13:57:06 +0200
Subject: [PATCH 018/218] add missing sticker translation

---
 src/i18n/strings/en_EN.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 338f744a9f..00b4051c9e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1265,5 +1265,6 @@
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.",
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.",
     "Incompatible local cache": "Incompatible local cache",
-    "Clear cache and resync": "Clear cache and resync"
+    "Clear cache and resync": "Clear cache and resync",
+    "Add some now": "Add some now"
 }

From 94aac62f255859a95d22b813e4e1004dca21449c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 15 Oct 2018 14:26:02 -0600
Subject: [PATCH 019/218] Move the login box from the left sidebar to where the
 composer is

Fixes https://github.com/vector-im/riot-web/issues/4227

This includes removing the collapse button that isn't needed anymore.
---
 res/css/structures/_LoginBox.scss      |  1 +
 src/components/structures/LeftPanel.js | 10 +----
 src/components/structures/LoginBox.js  | 62 ++++++--------------------
 src/components/structures/RoomView.js  |  7 ++-
 4 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/res/css/structures/_LoginBox.scss b/res/css/structures/_LoginBox.scss
index 7f6199c451..0a3e21a980 100644
--- a/res/css/structures/_LoginBox.scss
+++ b/res/css/structures/_LoginBox.scss
@@ -19,6 +19,7 @@ limitations under the License.
     height: unset !important;
     padding-top: 13px !important;
     padding-bottom: 14px !important;
+    order: 4;
 }
 
 .mx_LoginBox_loginButton_wrapper {
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index ebe5d7f507..72d640bcac 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -181,14 +181,8 @@ var LeftPanel = React.createClass({
         const BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
         const CallPreview = sdk.getComponent('voip.CallPreview');
 
-        let topBox;
-        if (this.context.matrixClient.isGuest()) {
-            const LoginBox = sdk.getComponent('structures.LoginBox');
-            topBox = <LoginBox collapsed={ this.props.collapsed }/>;
-        } else {
-            const SearchBox = sdk.getComponent('structures.SearchBox');
-            topBox = <SearchBox collapsed={ this.props.collapsed } onSearch={ this.onSearch } />;
-        }
+        const SearchBox = sdk.getComponent('structures.SearchBox');
+        const topBox = <SearchBox collapsed={ this.props.collapsed } onSearch={ this.onSearch } />;
 
         const classes = classNames(
             "mx_LeftPanel",
diff --git a/src/components/structures/LoginBox.js b/src/components/structures/LoginBox.js
index a9ea1f95c6..a2269706ee 100644
--- a/src/components/structures/LoginBox.js
+++ b/src/components/structures/LoginBox.js
@@ -1,5 +1,6 @@
 /*
 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.
@@ -16,31 +17,15 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 import { _t } from '../../languageHandler';
-var sdk = require('../../index')
-var dis = require('../../dispatcher');
-var rate_limited_func = require('../../ratelimitedfunc');
-var AccessibleButton = require('../../components/views/elements/AccessibleButton');
+const dis = require('../../dispatcher');
+const AccessibleButton = require('../../components/views/elements/AccessibleButton');
 
 module.exports = React.createClass({
     displayName: 'LoginBox',
 
     propTypes: {
-        collapsed: React.PropTypes.bool,
-    },
-
-    onToggleCollapse: function(show) {
-        if (show) {
-            dis.dispatch({
-                action: 'show_left_panel',
-            });
-        }
-        else {
-            dis.dispatch({
-                action: 'hide_left_panel',
-            });
-        }
     },
 
     onLoginClick: function() {
@@ -52,41 +37,20 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var TintableSvg = sdk.getComponent('elements.TintableSvg');
-
-        var toggleCollapse;
-        if (this.props.collapsed) {
-            toggleCollapse =
-                <AccessibleButton className="mx_SearchBox_maximise" onClick={ this.onToggleCollapse.bind(this, true) }>
-                    <TintableSvg src="img/maximise.svg" width="10" height="16" alt="Expand panel"/>
+        const loginButton = (
+            <div className="mx_LoginBox_loginButton_wrapper">
+                <AccessibleButton className="mx_LoginBox_loginButton" element="button" onClick={this.onLoginClick}>
+                    { _t("Login") }
                 </AccessibleButton>
-        }
-        else {
-            toggleCollapse =
-                <AccessibleButton className="mx_SearchBox_minimise" onClick={ this.onToggleCollapse.bind(this, false) }>
-                    <TintableSvg src="img/minimise.svg" width="10" height="16" alt="Collapse panel"/>
+                <AccessibleButton className="mx_LoginBox_registerButton" element="button" onClick={this.onRegisterClick}>
+                    { _t("Register") }
                 </AccessibleButton>
-        }
+            </div>
+        );
 
-        var loginButton;
-        if (!this.props.collapsed) {
-            loginButton = (
-                <div className="mx_LoginBox_loginButton_wrapper">
-                    <AccessibleButton className="mx_LoginBox_loginButton" element="button" onClick={this.onLoginClick}>
-                        { _t("Login") }
-                    </AccessibleButton>
-                    <AccessibleButton className="mx_LoginBox_registerButton" element="button" onClick={this.onRegisterClick}>
-                        { _t("Register") }
-                    </AccessibleButton>
-                </div>
-            );
-        }
-
-        var self = this;
         return (
-            <div className="mx_SearchBox mx_LoginBox">
+            <div className="mx_LoginBox">
                 { loginButton }
-                { toggleCollapse }
             </div>
         );
     }
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 32121d6de5..62c596e939 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1669,7 +1669,7 @@ module.exports = React.createClass({
         let messageComposer, searchInfo;
         const canSpeak = (
             // joined and not showing search results
-            myMembership == 'join' && !this.state.searchResults
+            myMembership === 'join' && !this.state.searchResults
         );
         if (canSpeak) {
             messageComposer =
@@ -1683,6 +1683,11 @@ module.exports = React.createClass({
                 />;
         }
 
+        if (MatrixClientPeg.get().isGuest()) {
+            const LoginBox = sdk.getComponent('structures.LoginBox');
+            messageComposer = <LoginBox/>;
+        }
+
         // TODO: Why aren't we storing the term/scope/count in this format
         // in this.state if this is what RoomHeader desires?
         if (this.state.searchResults) {

From 2d62fda86262547c32887bbb17c64d40842d572f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 15 Oct 2018 14:35:36 -0600
Subject: [PATCH 020/218] Don't show the invite nag bar when peeking

---
 src/components/structures/RoomStatusBar.js | 6 +++++-
 src/components/structures/RoomView.js      | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 4f9ac153f5..c6a6e1e2d3 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -66,6 +66,10 @@ module.exports = React.createClass({
         // result in "X, Y, Z and 100 others are typing."
         whoIsTypingLimit: PropTypes.number,
 
+        // true if the room is being peeked at. This affects components that shouldn't
+        // logically be shown when peeking, such as a prompt to invite people to a room.
+        isPeeking: PropTypes.bool,
+
         // callback for when the user clicks on the 'resend all' button in the
         // 'unsent messages' bar
         onResendAllClick: PropTypes.func,
@@ -457,7 +461,7 @@ module.exports = React.createClass({
         }
 
         // If you're alone in the room, and have sent a message, suggest to invite someone
-        if (this.props.sentMessageAndIsAlone) {
+        if (this.props.sentMessageAndIsAlone && !this.props.isPeeking) {
             return (
                 <div className="mx_RoomStatusBar_isAlone">
                     { _t("There's no one else here! Would you like to <inviteText>invite others</inviteText> " +
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 32121d6de5..8e226bdfcf 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1595,6 +1595,7 @@ module.exports = React.createClass({
                 atEndOfLiveTimeline={this.state.atEndOfLiveTimeline}
                 sentMessageAndIsAlone={this.state.isAlone}
                 hasActiveCall={inCall}
+                isPeeking={myMembership !== "join"}
                 onInviteClick={this.onInviteButtonClick}
                 onStopWarningClick={this.onStopAloneWarningClick}
                 onScrollToBottomClick={this.jumpToLiveTimeline}

From 6323d78b0cfc5857fde1b72fa9831daa25cc360c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 15 Oct 2018 14:41:00 -0600
Subject: [PATCH 021/218] Move tinter init to MatrixChat

This is a much better place for it to live
---
 src/MatrixClientPeg.js                  | 4 ----
 src/components/structures/MatrixChat.js | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index b524033b70..04b3b47e43 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -27,7 +27,6 @@ import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
 import {phasedRollOutExpiredForUser} from "./PhasedRollOut";
-import Tinter from "./Tinter";
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -134,9 +133,6 @@ class MatrixClientPeg {
             }
         }
 
-        const color_scheme = SettingsStore.getValue("roomColor");
-        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
-
         // Connect the matrix client to the dispatcher
         MatrixActionCreators.start(this.matrixClient);
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index db5e898946..f385aacd40 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1403,6 +1403,11 @@ export default React.createClass({
                     break;
             }
         });
+
+        // Fire the tinter right on startup to ensure the default theme is applied
+        // A later sync can/will correct the tint to be the right value for the user
+        const color_scheme = SettingsStore.getValue("roomColor");
+        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
     },
 
     /**

From d87ab8aac0d3dc2343d46be99e33ea99aa04a490 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 15 Oct 2018 16:12:42 -0600
Subject: [PATCH 022/218] Support m.login.terms during registration

Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
---
 .../login/InteractiveAuthEntryComponents.js   | 99 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  2 +
 2 files changed, 101 insertions(+)

diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index bfdfbb63bf..d4c2f58aa9 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -22,6 +22,7 @@ import classnames from 'classnames';
 
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import SettingsStore from "../../../settings/SettingsStore";
 
 /* This file contains a collection of components which are used by the
  * InteractiveAuth to prompt the user to enter the information needed
@@ -209,6 +210,103 @@ export const RecaptchaAuthEntry = React.createClass({
     },
 });
 
+export const TermsAuthEntry = React.createClass({
+    displayName: 'TermsAuthEntry',
+
+    statics: {
+        LOGIN_TYPE: "m.login.terms",
+    },
+
+    propTypes: {
+        submitAuthDict: PropTypes.func.isRequired,
+        stageParams: PropTypes.object.isRequired,
+        errorText: PropTypes.string,
+        busy: PropTypes.bool,
+    },
+
+    componentWillMount: function() {
+        const allPolicies = this.props.stageParams.policies || {};
+        const prefLang = SettingsStore.getValue("language");
+        const initToggles = {};
+        const pickedPolicies = [];
+        for (const policyId of Object.keys(allPolicies)) {
+            const policy = allPolicies[policyId];
+
+            // Pick a language based on the user's language, falling back to english,
+            // and finally to the first language available. If there's still no policy
+            // available then the homeserver isn't respecting the spec.
+            const availableLangs = Object.keys(policy).filter(e => e !== "version");
+            let langPolicy = policy[prefLang];
+            if (!langPolicy) langPolicy = "en";
+            if (!langPolicy) langPolicy = policy[availableLangs[0]]; // last resort
+            if (!langPolicy) throw new Error("Failed to find a policy to show the user");
+
+            initToggles[policyId] = false;
+
+            langPolicy.id = policyId;
+            pickedPolicies.push(langPolicy);
+        }
+
+        this.setState({
+            "toggledPolicies": initToggles,
+            "policies": pickedPolicies,
+        });
+    },
+
+    _trySubmit: function(policyId) {
+        const newToggles = {};
+        let allChecked = true;
+        for (const policy of this.state.policies) {
+            let checked = this.state.toggledPolicies[policy.id];
+            if (policy.id === policyId) checked = !checked;
+
+            newToggles[policy.id] = checked;
+            allChecked = allChecked && checked;
+        }
+
+        this.setState({"toggledPolicies": newToggles});
+        if (allChecked) this.props.submitAuthDict({type: TermsAuthEntry.LOGIN_TYPE});
+    },
+
+    render: function() {
+        if (this.props.busy) {
+            const Loader = sdk.getComponent("elements.Spinner");
+            return <Loader />;
+        }
+
+        let checkboxes = [];
+        let allChecked = true;
+        for (const policy of this.state.policies) {
+            const checked = this.state.toggledPolicies[policy.id];
+            allChecked = allChecked && checked;
+
+            checkboxes.push(
+                <label key={"policy_checkbox_" + policy.id}>
+                    <input type="checkbox" onClick={() => this._trySubmit(policy.id)} checked={checked} />
+                    <a href={policy.url} target="_blank" rel="noopener">{ policy.name }</a>
+                </label>
+            );
+        }
+
+        let errorSection;
+        if (this.props.errorText) {
+            errorSection = (
+                <div className="error" role="alert">
+                    { this.props.errorText }
+                </div>
+            );
+        }
+
+        return (
+            <div>
+                <p>{_t("Please review and accept the policies of this homeserver:")}</p>
+                { checkboxes }
+                { errorSection }
+            </div>
+        );
+    },
+});
+
 export const EmailIdentityAuthEntry = React.createClass({
     displayName: 'EmailIdentityAuthEntry',
 
@@ -496,6 +594,7 @@ const AuthEntryComponents = [
     RecaptchaAuthEntry,
     EmailIdentityAuthEntry,
     MsisdnAuthEntry,
+    TermsAuthEntry,
 ];
 
 export function getEntryComponentForLoginType(loginType) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 338f744a9f..e00be22d1c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -643,6 +643,8 @@
     "Dismiss": "Dismiss",
     "To continue, please enter your password.": "To continue, please enter your password.",
     "Password:": "Password:",
+    "Please accept all of the policies": "Please accept all of the policies",
+    "Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:",
     "An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s",
     "Please check your email to continue registration.": "Please check your email to continue registration.",
     "Token incorrect": "Token incorrect",

From b929c362223f1c72efda035b0e2173baf66968e6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Oct 2018 09:19:36 -0600
Subject: [PATCH 023/218] Documentation++

---
 .../login/InteractiveAuthEntryComponents.js   | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index d4c2f58aa9..6e0e5d538a 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -225,6 +225,25 @@ export const TermsAuthEntry = React.createClass({
     },
 
     componentWillMount: function() {
+        // example stageParams:
+        //
+        // {
+        //     "policies": {
+        //         "privacy_policy": {
+        //             "version": "1.0",
+        //             "en": {
+        //                 "name": "Privacy Policy",
+        //                 "url": "https://example.org/privacy-1.0-en.html",
+        //             },
+        //             "fr": {
+        //                 "name": "Politique de confidentialité",
+        //                 "url": "https://example.org/privacy-1.0-fr.html",
+        //             },
+        //         },
+        //         "other_policy": { ... },
+        //     }
+        // }
+
         const allPolicies = this.props.stageParams.policies || {};
         const prefLang = SettingsStore.getValue("language");
         const initToggles = {};
@@ -235,10 +254,13 @@ export const TermsAuthEntry = React.createClass({
             // Pick a language based on the user's language, falling back to english,
             // and finally to the first language available. If there's still no policy
             // available then the homeserver isn't respecting the spec.
-            const availableLangs = Object.keys(policy).filter(e => e !== "version");
             let langPolicy = policy[prefLang];
-            if (!langPolicy) langPolicy = "en";
-            if (!langPolicy) langPolicy = policy[availableLangs[0]]; // last resort
+            if (!langPolicy) langPolicy = policy["en"];
+            if (!langPolicy) {
+                // last resort
+                const firstLang = Object.keys(policy).find(e => e !== "version");
+                langPolicy = policy[firstLang];
+            }
             if (!langPolicy) throw new Error("Failed to find a policy to show the user");
 
             initToggles[policyId] = false;

From d504cdeb8592adc6ff9834559ee51e2c7170343b Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 16 Oct 2018 15:51:58 +0000
Subject: [PATCH 024/218] Translated using Weblate (German)

Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b183c8bfcd..5cb856b651 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1289,5 +1289,7 @@
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "Du hast zuvor Riot auf %(host)s ohne verzögertem Laden von Mitgliedern genutzt. In dieser Version war das verzögerte Laden deaktiviert. Da die lokal zwischengespeicherten Daten zwischen diesen Einstellungen nicht kompatibel ist, muss Riot dein Konto neu synchronisieren.",
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Wenn Riot mit der alten Version in einem anderen Tab geöffnet ist, schließe dies bitte, da das parallele Nutzen von Riot auf demselben Host mit aktivierten und deaktivierten verzögertem Laden, Probleme verursachen wird.",
     "Incompatible local cache": "Inkompatibler lokaler Zwischenspeicher",
-    "Clear cache and resync": "Zwischenspeicher löschen und erneut synchronisieren"
+    "Clear cache and resync": "Zwischenspeicher löschen und erneut synchronisieren",
+    "Please accept all of the policies": "Bitte akzeptiere alle Bedingungen",
+    "Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:"
 }

From 7d60e09f8ebef8fb6330f33d220ed1cbb08b49e8 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 16 Oct 2018 18:03:52 +0000
Subject: [PATCH 025/218] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 51105ed5c5..5a7c5d210a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1291,5 +1291,7 @@
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "Előzőleg a szoba tagság késleltetett betöltésének engedélyével itt használtad a Riotot: %(host)s. Ebben a verzióban viszont a késleltetett betöltés nem engedélyezett. Mivel a két gyorsítótár nem kompatibilis egymással így Riotnak újra kell szinkronizálnia a fiókot.",
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ha a másik Riot verzió fut még egy másik fülön, kérlek zárd be, mivel ha ugyanott használod a Riotot bekapcsolt késleltetett betöltéssel és kikapcsolva is akkor problémák adódhatnak.",
     "Incompatible local cache": "A helyi gyorsítótár nem kompatibilis ezzel a verzióval",
-    "Clear cache and resync": "Gyorsítótár törlése és újraszinkronizálás"
+    "Clear cache and resync": "Gyorsítótár törlése és újraszinkronizálás",
+    "Please accept all of the policies": "Kérlek fogadd el az összes előírást",
+    "Please review and accept the policies of this homeserver:": "Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:"
 }

From 8668faa6b0f3d1ee643b70884253978fcfda5626 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Oct 2018 19:14:06 -0600
Subject: [PATCH 026/218] Show the group member list again

Fixes https://github.com/vector-im/riot-web/issues/7511
---
 res/css/views/rooms/_MemberList.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index 83fc70aefb..cfac8797b9 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -111,6 +111,3 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_MemberList_outerWrapper {
-    height: 0px;
-}

From 2295347d8d3356337e6893410b20e54cb29dbfc4 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 17 Oct 2018 09:24:25 +0000
Subject: [PATCH 027/218] Translated using Weblate (Italian)

Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d877be6c9e..962e179cc8 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1288,5 +1288,7 @@
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "Hai usato Riot precedentemente su %(host)s con il caricamento lento dei membri attivato. In questa versione il caricamento lento è disattivato. Dato che la cache locale non è compatibile tra queste due impostazioni, Riot deve risincronizzare il tuo account.",
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Se l'altra versione di Riot è ancora aperta in un'altra scheda, chiudila perchè usare Riot nello stesso host con il caricamento lento sia attivato che disattivato può causare errori.",
     "Incompatible local cache": "Cache locale non compatibile",
-    "Clear cache and resync": "Svuota cache e risincronizza"
+    "Clear cache and resync": "Svuota cache e risincronizza",
+    "Please accept all of the policies": "Si prega di accettare tutte le condizioni",
+    "Please review and accept the policies of this homeserver:": "Consulta ed accetta le condizioni di questo homeserver:"
 }

From 482360742ffdffe5a976a97aab48a4b442f38361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 16 Oct 2018 22:07:53 +0000
Subject: [PATCH 028/218] Translated using Weblate (French)

Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ede9c26656..196ea4bcd9 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1291,5 +1291,7 @@
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "Vous avez utilisé auparavant Riot sur %(host)s avec le chargement différé activé. Dans cette version le chargement différé est désactivé. Comme le cache local n'est pas compatible entre ces deux réglages, Riot doit resynchroniser votre compte.",
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Si l'autre version de Riot est encore ouverte dans un autre onglet, merci de le fermer car l'utilisation de Riot sur le même hôte avec le chargement différé activé et désactivé à la fois causera des problèmes.",
     "Incompatible local cache": "Cache local incompatible",
-    "Clear cache and resync": "Vider le cache et resynchroniser"
+    "Clear cache and resync": "Vider le cache et resynchroniser",
+    "Please accept all of the policies": "Veuillez accepter toutes les politiques",
+    "Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d'accueil :"
 }

From 336ea96c91d869ef2b975e70b4f1c7f116981a08 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 16 Oct 2018 18:06:25 +0000
Subject: [PATCH 029/218] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 5a7c5d210a..e4bf2e3036 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1292,6 +1292,6 @@
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ha a másik Riot verzió fut még egy másik fülön, kérlek zárd be, mivel ha ugyanott használod a Riotot bekapcsolt késleltetett betöltéssel és kikapcsolva is akkor problémák adódhatnak.",
     "Incompatible local cache": "A helyi gyorsítótár nem kompatibilis ezzel a verzióval",
     "Clear cache and resync": "Gyorsítótár törlése és újraszinkronizálás",
-    "Please accept all of the policies": "Kérlek fogadd el az összes előírást",
+    "Please accept all of the policies": "Kérlek fogadd el a felhasználói feltételeket",
     "Please review and accept the policies of this homeserver:": "Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:"
 }

From e1be8966bcf805bcdb5de3d542e453b7c4f88112 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 17 Oct 2018 15:45:48 +0000
Subject: [PATCH 030/218] Translated using Weblate (Basque)

Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 96f201672d..5adbe476e7 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1285,5 +1285,12 @@
     "<h1>HTML for your community's page</h1>\r\n<p>\r\n    Use the long description to introduce new members to the community, or distribute\r\n    some important <a href=\"foo\">links</a>\r\n</p>\r\n<p>\r\n    You can even use 'img' tags\r\n</p>\r\n": "<h1>Zure komunitatearen orriaren HTMLa</h1>\n<p>\n    Erabili deskripzio luzea kide berriek komunitatea ezagutu dezaten, edo eman ezagutzera <a href=\"foo\">esteka</a> garrantzitsuak\n</p>\n<p>\n    'img' etiketak erabili ditzakezu ere\n</p>\n",
     "Submit Debug Logs": "Bidali arazketa egunkariak",
     "An email address is required to register on this homeserver.": "e-mail helbide bat behar da hasiera-zerbitzari honetan izena emateko.",
-    "A phone number is required to register on this homeserver.": "telefono zenbaki bat behar da hasiera-zerbitzari honetan izena emateko."
+    "A phone number is required to register on this homeserver.": "telefono zenbaki bat behar da hasiera-zerbitzari honetan izena emateko.",
+    "Please accept all of the policies": "Onartu mesedez politika guztiak",
+    "Please review and accept the policies of this homeserver:": "Irakurri eta onartu hasiera zerbitzari honen politikak:",
+    "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "Aurretik Riot erabili duzu %(host)s zerbitzarian kideen karga alferra gaituta zenuela. Bertsio honetan karga alferra desgaituta dago. Katxe lokala bi ezarpen hauen artean bateragarria ez denez, Riotek zure kontua berriro sinkronizatu behar du.",
+    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Rioten beste bertsioa oraindik beste fitxat batean irekita badago, itxi ezazu zerbitzari bera aldi berean karga alferra gaituta eta desgaituta erabiltzeak arazoak sor ditzakeelako.",
+    "Incompatible local cache": "Katxe lokal bateraezina",
+    "Clear cache and resync": "Garbitu katxea eta sinkronizatu berriro",
+    "Add some now": "Gehitu batzuk orain"
 }

From 2f94631720a870ca881a494acaccc90853ddd832 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 16 Oct 2018 18:06:25 +0000
Subject: [PATCH 031/218] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index e4bf2e3036..8ce023f377 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1293,5 +1293,6 @@
     "Incompatible local cache": "A helyi gyorsítótár nem kompatibilis ezzel a verzióval",
     "Clear cache and resync": "Gyorsítótár törlése és újraszinkronizálás",
     "Please accept all of the policies": "Kérlek fogadd el a felhasználói feltételeket",
-    "Please review and accept the policies of this homeserver:": "Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:"
+    "Please review and accept the policies of this homeserver:": "Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:",
+    "Add some now": "Adj hozzá párat"
 }

From af8dfda9a7a78873d5e0b7f5aede5cd266ed270c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 17 Oct 2018 13:53:12 -0600
Subject: [PATCH 032/218] Add a bit of text to explain the purpose of the
 RoomPreviewSpinner

Fixes https://github.com/vector-im/riot-web/issues/5869
---
 res/css/views/rooms/_RoomPreviewBar.scss     |  4 ++++
 src/components/structures/RoomView.js        |  3 +++
 src/components/views/rooms/RoomPreviewBar.js | 11 ++++++++++-
 src/i18n/strings/en_EN.json                  |  1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index 331eb582ea..8196740499 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -56,3 +56,7 @@ limitations under the License.
 .mx_RoomPreviewBar_warningIcon {
     padding: 12px;
 }
+
+.mx_RoomPreviewBar_spinnerIntro {
+    margin-top: 50px;
+}
\ No newline at end of file
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8e226bdfcf..52264266a8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1514,6 +1514,7 @@ module.exports = React.createClass({
                                             canPreview={false} error={this.state.roomLoadError}
                                             roomAlias={roomAlias}
                                             spinner={this.state.joining}
+                                            spinnerState="joining"
                                             inviterName={inviterName}
                                             invitedEmail={invitedEmail}
                                             room={this.state.room}
@@ -1558,6 +1559,7 @@ module.exports = React.createClass({
                                             inviterName={inviterName}
                                             canPreview={false}
                                             spinner={this.state.joining}
+                                            spinnerState="joining"
                                             room={this.state.room}
                             />
                         </div>
@@ -1645,6 +1647,7 @@ module.exports = React.createClass({
                                 onForgetClick={this.onForgetClick}
                                 onRejectClick={this.onRejectThreepidInviteButtonClicked}
                                 spinner={this.state.joining}
+                                spinnerState="joining"
                                 inviterName={inviterName}
                                 invitedEmail={invitedEmail}
                                 canPreview={this.state.canPeek}
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 5ec19d185e..9d3dbe5217 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -44,9 +44,13 @@ module.exports = React.createClass({
         error: PropTypes.object,
 
         canPreview: PropTypes.bool,
-        spinner: PropTypes.bool,
         room: PropTypes.object,
 
+        // When a spinner is present, a spinnerState can be specified to indicate the
+        // purpose of the spinner.
+        spinner: PropTypes.bool,
+        spinnerState: PropTypes.oneOf(["joining"]),
+
         // The alias that was used to access this room, if appropriate
         // If given, this will be how the room is referred to (eg.
         // in error messages).
@@ -93,7 +97,12 @@ module.exports = React.createClass({
 
         if (this.props.spinner || this.state.busy) {
             const Spinner = sdk.getComponent("elements.Spinner");
+            let spinnerIntro = "";
+            if (this.props.spinnerState === "joining") {
+                spinnerIntro = _t("Joining room...");
+            }
             return (<div className="mx_RoomPreviewBar">
+                <p className="mx_RoomPreviewBar_spinnerIntro">{ spinnerIntro }</p>
                 <Spinner />
             </div>);
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e42d3ce434..e0f4663532 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -512,6 +512,7 @@
     "You have no historical rooms": "You have no historical rooms",
     "Historical": "Historical",
     "System Alerts": "System Alerts",
+    "Joining room...": "Joining room...",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Unable to ascertain that the address this invite was sent to matches one associated with your account.",
     "This invitation was sent to an email address which is not associated with this account:": "This invitation was sent to an email address which is not associated with this account:",
     "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",

From 7b8506ba653548a040822a75814ea3a19c553c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 16 Oct 2018 22:07:53 +0000
Subject: [PATCH 033/218] Translated using Weblate (French)

Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 196ea4bcd9..125ac49b79 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1293,5 +1293,6 @@
     "Incompatible local cache": "Cache local incompatible",
     "Clear cache and resync": "Vider le cache et resynchroniser",
     "Please accept all of the policies": "Veuillez accepter toutes les politiques",
-    "Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d'accueil :"
+    "Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d'accueil :",
+    "Add some now": "En ajouter maintenant"
 }

From fc4d4acacea7418dfd71eaa6011ac2e66f70e6cf Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 18 Oct 2018 12:07:22 +0000
Subject: [PATCH 034/218] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 9921662964..b49384891c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1288,5 +1288,8 @@
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "Преди сте използвали Riot на %(host)s с включено постепенно зареждане на членове. В тази версия, тази настройка е изключена. Понеже локалният кеш не е съвместим при тези две настройки, Riot трябва да синхронизира акаунта Ви наново.",
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ако другата версия на Riot все още е отворена в друг таб, моля затворете я. Използването на Riot на един адрес във версии с постепенно и без постепенно зареждане ще причини проблеми.",
     "Incompatible local cache": "Несъвместим локален кеш",
-    "Clear cache and resync": "Изчисти кеша и ресинхронизирай"
+    "Clear cache and resync": "Изчисти кеша и ресинхронизирай",
+    "Please accept all of the policies": "Моля, приемете всички политики",
+    "Please review and accept the policies of this homeserver:": "Моля, прегледайте и приемете политиките на този сървър:",
+    "Add some now": "Добави сега"
 }

From 0030ba7015c8e2626d739abe6cdad77ea0a4f27c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 18 Oct 2018 16:42:54 -0600
Subject: [PATCH 035/218] Support .well-known discovery

Fixes https://github.com/vector-im/riot-web/issues/7253
---
 src/components/structures/login/Login.js    | 152 +++++++++++++++++++-
 src/components/views/login/PasswordLogin.js |   9 +-
 src/components/views/login/ServerConfig.js  |  17 +++
 src/i18n/strings/en_EN.json                 |   2 +
 4 files changed, 173 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 45f523f141..2ab922c827 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -26,6 +26,7 @@ import Login from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
 import SettingsStore from "../../../settings/SettingsStore";
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
+import request from 'browser-request';
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -74,6 +75,11 @@ module.exports = React.createClass({
             phoneCountry: null,
             phoneNumber: "",
             currentFlow: "m.login.password",
+
+            // .well-known discovery
+            discoveredHsUrl: "",
+            discoveredIsUrl: "",
+            discoveryError: "",
         };
     },
 
@@ -102,6 +108,15 @@ module.exports = React.createClass({
     },
 
     onPasswordLogin: function(username, phoneCountry, phoneNumber, password) {
+        // Prevent people from submitting their password when homeserver
+        // discovery went wrong
+        if (this.state.discoveryError) return;
+
+        if (this.state.discoveredHsUrl) {
+            console.log("Rewriting username because the homeserver was discovered");
+            username = username.substring(1).split(":")[0];
+        }
+
         this.setState({
             busy: true,
             errorText: null,
@@ -218,8 +233,12 @@ module.exports = React.createClass({
         }).done();
     },
 
-    onUsernameChanged: function(username) {
+    onUsernameChanged: function(username, endOfInput) {
         this.setState({ username: username });
+        if (username[0] === "@" && endOfInput) {
+            const serverName = username.split(':').slice(1).join(':');
+            this._tryWellKnownDiscovery(serverName);
+        }
     },
 
     onPhoneCountryChanged: function(phoneCountry) {
@@ -257,6 +276,125 @@ module.exports = React.createClass({
         });
     },
 
+    _tryWellKnownDiscovery: async function(serverName) {
+        if (!serverName.trim()) {
+            // Nothing to discover
+            this.setState({discoveryError: "", discoveredHsUrl: "", discoveredIsUrl: ""});
+            return;
+        }
+
+        try {
+            const wellknown = await this._getWellKnownObject(`https://${serverName}/.well-known/matrix/client`);
+            if (!wellknown["m.homeserver"]) {
+                console.error("No m.homeserver key in well-known response");
+                this.setState({discoveryError: _t("Invalid homeserver discovery response")});
+                return;
+            }
+
+            const hsUrl = this._sanitizeWellKnownUrl(wellknown["m.homeserver"]["base_url"]);
+            if (!hsUrl) {
+                console.error("Invalid base_url for m.homeserver");
+                this.setState({discoveryError: _t("Invalid homeserver discovery response")});
+                return;
+            }
+
+            console.log("Verifying homeserver URL: " + hsUrl);
+            const hsVersions = await this._getWellKnownObject(`${hsUrl}/_matrix/client/versions`);
+            if (!hsVersions["versions"]) {
+                console.error("Invalid /versions response");
+                this.setState({discoveryError: _t("Invalid homeserver discovery response")});
+                return;
+            }
+
+            let isUrl = "";
+            if (wellknown["m.identity_server"]) {
+                isUrl = this._sanitizeWellKnownUrl(wellknown["m.identity_server"]["base_url"]);
+                if (!isUrl) {
+                    console.error("Invalid base_url for m.identity_server");
+                    this.setState({discoveryError: _t("Invalid homeserver discovery response")});
+                    return;
+                }
+
+                // XXX: We don't verify the identity server URL because sydent doesn't register
+                // the route we need.
+
+                // console.log("Verifying identity server URL: " + isUrl);
+                // const isResponse = await this._getWellKnownObject(`${isUrl}/_matrix/identity/api/v1`);
+                // if (!isResponse) {
+                //     console.error("Invalid /api/v1 response");
+                //     this.setState({discoveryError: _t("Invalid homeserver discovery response")});
+                //     return;
+                // }
+            }
+
+            this.setState({discoveredHsUrl: hsUrl, discoveredIsUrl: isUrl, discoveryError: ""});
+        } catch (e) {
+            console.error(e);
+            if (e.wkAction) {
+                if (e.wkAction === "FAIL_ERROR" || e.wkAction === "FAIL_PROMPT") {
+                    // We treat FAIL_ERROR and FAIL_PROMPT the same to avoid having the user
+                    // submit their details to the wrong homeserver. In practice, the custom
+                    // server options will show up to try and guide the user into entering
+                    // the required information.
+                    this.setState({discoveryError: _t("Cannot find homeserver")});
+                    return;
+                } else if (e.wkAction === "IGNORE") {
+                    // Nothing to discover
+                    this.setState({discoveryError: "", discoveredHsUrl: "", discoveredIsUrl: ""});
+                    return;
+                }
+            }
+
+            throw e;
+        }
+    },
+
+    _sanitizeWellKnownUrl: function(url) {
+        if (!url) return false;
+
+        const parser = document.createElement('a');
+        parser.href = url;
+
+        if (parser.protocol !== "http:" && parser.protocol !== "https:") return false;
+        if (!parser.hostname) return false;
+
+        const port = parser.port ? `:${parser.port}` : "";
+        const path = parser.pathname ? parser.pathname : "";
+        let saferUrl = `${parser.protocol}//${parser.hostname}${port}${path}`;
+        if (saferUrl.endsWith("/")) saferUrl = saferUrl.substring(0, saferUrl.length - 1);
+        return saferUrl;
+    },
+
+    _getWellKnownObject: function(url) {
+        return new Promise(function(resolve, reject) {
+            request(
+                { method: "GET", url: url },
+                (err, response, body) => {
+                    if (err || response.status < 200 || response.status >= 300) {
+                        let action = "FAIL_ERROR";
+                        if (response.status === 404) {
+                            // We could just resolve with an empty object, but that
+                            // causes a different series of branches when the m.homeserver
+                            // bit of the JSON is missing.
+                            action = "IGNORE";
+                        }
+                        reject({err: err, response: response, wkAction: action});
+                        return;
+                    }
+
+                    try {
+                        resolve(JSON.parse(body));
+                    }catch (e) {
+                        console.error(e);
+                        if (e.name === "SyntaxError") {
+                            reject({wkAction: "FAIL_PROMPT", wkError: "Invalid JSON"});
+                        } else throw e;
+                    }
+                },
+            );
+        });
+    },
+
     _initLoginLogic: function(hsUrl, isUrl) {
         const self = this;
         hsUrl = hsUrl || this.state.enteredHomeserverUrl;
@@ -418,6 +556,8 @@ module.exports = React.createClass({
         const ServerConfig = sdk.getComponent("login.ServerConfig");
         const loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null;
 
+        const errorText = this.state.discoveryError || this.state.errorText;
+
         let loginAsGuestJsx;
         if (this.props.enableGuest) {
             loginAsGuestJsx =
@@ -432,8 +572,8 @@ module.exports = React.createClass({
         if (!SdkConfig.get()['disable_custom_urls']) {
             serverConfig = <ServerConfig ref="serverConfig"
                 withToggleButton={true}
-                customHsUrl={this.props.customHsUrl}
-                customIsUrl={this.props.customIsUrl}
+                customHsUrl={this.state.discoveredHsUrl || this.props.customHsUrl}
+                customIsUrl={this.state.discoveredIsUrl ||this.props.customIsUrl}
                 defaultHsUrl={this.props.defaultHsUrl}
                 defaultIsUrl={this.props.defaultIsUrl}
                 onServerConfigChange={this.onServerConfigChange}
@@ -445,16 +585,16 @@ module.exports = React.createClass({
         if (theme !== "status") {
             header = <h2>{ _t('Sign in') } { loader }</h2>;
         } else {
-            if (!this.state.errorText) {
+            if (!errorText) {
                 header = <h2>{ _t('Sign in to get started') } { loader }</h2>;
             }
         }
 
         let errorTextSection;
-        if (this.state.errorText) {
+        if (errorText) {
             errorTextSection = (
                 <div className="mx_Login_error">
-                    { this.state.errorText }
+                    { errorText }
                 </div>
             );
         }
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index a0e5ab0ddb..0e3aed1187 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -53,6 +53,7 @@ class PasswordLogin extends React.Component {
 
         this.onSubmitForm = this.onSubmitForm.bind(this);
         this.onUsernameChanged = this.onUsernameChanged.bind(this);
+        this.onUsernameBlur = this.onUsernameBlur.bind(this);
         this.onLoginTypeChange = this.onLoginTypeChange.bind(this);
         this.onPhoneCountryChanged = this.onPhoneCountryChanged.bind(this);
         this.onPhoneNumberChanged = this.onPhoneNumberChanged.bind(this);
@@ -121,7 +122,11 @@ class PasswordLogin extends React.Component {
 
     onUsernameChanged(ev) {
         this.setState({username: ev.target.value});
-        this.props.onUsernameChanged(ev.target.value);
+        this.props.onUsernameChanged(ev.target.value, false);
+    }
+
+    onUsernameBlur(ev) {
+        this.props.onUsernameChanged(this.state.username, true);
     }
 
     onLoginTypeChange(loginType) {
@@ -167,6 +172,7 @@ class PasswordLogin extends React.Component {
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
                     onChange={this.onUsernameChanged}
+                    onBlur={this.onUsernameBlur}
                     placeholder="joe@example.com"
                     value={this.state.username}
                     autoFocus
@@ -182,6 +188,7 @@ class PasswordLogin extends React.Component {
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
                     onChange={this.onUsernameChanged}
+                    onBlur={this.onUsernameBlur}
                     placeholder={SdkConfig.get().disable_custom_urls ?
                                       _t("Username on %(hs)s", {
                                         hs: this.props.hsUrl.replace(/^https?:\/\//, ''),
diff --git a/src/components/views/login/ServerConfig.js b/src/components/views/login/ServerConfig.js
index a6944ec20a..2f04011273 100644
--- a/src/components/views/login/ServerConfig.js
+++ b/src/components/views/login/ServerConfig.js
@@ -70,6 +70,23 @@ module.exports = React.createClass({
         };
     },
 
+    componentWillReceiveProps: function(newProps) {
+        if (newProps.customHsUrl === this.state.hs_url &&
+            newProps.customIsUrl === this.state.is_url) return;
+
+        this.setState({
+            hs_url: newProps.customHsUrl,
+            is_url: newProps.customIsUrl,
+            configVisible: !newProps.withToggleButton ||
+                (newProps.customHsUrl !== newProps.defaultHsUrl) ||
+                (newProps.customIsUrl !== newProps.defaultIsUrl),
+        });
+        this.props.onServerConfigChange({
+            hsUrl: newProps.customHsUrl,
+            isUrl: newProps.customIsUrl,
+        });
+    },
+
     onHomeserverChanged: function(ev) {
         this.setState({hs_url: ev.target.value}, function() {
             this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, function() {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e42d3ce434..be0963656d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1205,6 +1205,8 @@
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
     "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
     "The phone number entered looks invalid": "The phone number entered looks invalid",
+    "Invalid homeserver discovery response": "Invalid homeserver discovery response",
+    "Cannot find homeserver": "Cannot find homeserver",
     "This homeserver doesn't offer any login flows which are supported by this client.": "This homeserver doesn't offer any login flows which are supported by this client.",
     "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",

From 71a97170d79fdf1f5941f4cb6c742b05fb5cc7f1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 18 Oct 2018 17:06:47 -0600
Subject: [PATCH 036/218] Linting

---
 src/components/structures/login/Login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 2ab922c827..6a33e9369b 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -384,7 +384,7 @@ module.exports = React.createClass({
 
                     try {
                         resolve(JSON.parse(body));
-                    }catch (e) {
+                    } catch (e) {
                         console.error(e);
                         if (e.name === "SyntaxError") {
                             reject({wkAction: "FAIL_PROMPT", wkError: "Invalid JSON"});

From eb517fe2e9a1199a070152f90f1e1e229aea27bc Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 19 Oct 2018 01:18:29 +0000
Subject: [PATCH 037/218] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 5b259066a7..e3492d1ef6 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1289,5 +1289,8 @@
     "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "您之前曾在 %(host)s 上使用 Riot 並啟用成員列表的延遲載入。在此版本中延遲載入已停用。由於本機快取在這兩個設定間不相容，Riot 必須重新同步您的帳號。",
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "若其他分頁仍有不同版本的 Riot，請將其關閉，因為在同一個主機上同時啟用和停用延遲載入將會發生問題。",
     "Incompatible local cache": "不相容的本機快取",
-    "Clear cache and resync": "清除快取並重新同步"
+    "Clear cache and resync": "清除快取並重新同步",
+    "Please accept all of the policies": "請接受所有政策",
+    "Please review and accept the policies of this homeserver:": "請審閱並接受此家伺服器的政策：",
+    "Add some now": "現在就新增一些"
 }

From fa14d0ed3c2e6f84ab38448faac2c14b51bc3e96 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 15 Oct 2018 14:41:00 -0600
Subject: [PATCH 038/218] Move tinter init to MatrixChat

This is a much better place for it to live
---
 src/components/structures/MatrixChat.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index db5e898946..f385aacd40 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1403,6 +1403,11 @@ export default React.createClass({
                     break;
             }
         });
+
+        // Fire the tinter right on startup to ensure the default theme is applied
+        // A later sync can/will correct the tint to be the right value for the user
+        const color_scheme = SettingsStore.getValue("roomColor");
+        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
     },
 
     /**

From 0f592f5887575470f47adcf9b84f02d9441b0bd7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 19 Oct 2018 16:39:07 +0200
Subject: [PATCH 039/218] Prepare changelog for v0.14.1

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40cb8c5283..00b035ac9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.14.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.1) (2018-10-19)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.0...v0.14.1)
+
+ * Apply the user's tint once the MatrixClientPeg is moderately ready
+   [\#2214](https://github.com/matrix-org/matrix-react-sdk/pull/2214)
+
 Changes in [0.14.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.0) (2018-10-16)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.0-rc.1...v0.14.0)

From 167746f41d891d053643e061a583489f2826755a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 19 Oct 2018 16:39:08 +0200
Subject: [PATCH 040/218] v0.14.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93cbcd1c67..38ed26f23c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 738313384609a8ed05072c0a97723c0a9350d648 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 19 Oct 2018 13:30:38 -0600
Subject: [PATCH 041/218] Support parsing matrix.to links in the timeline with
 ?via= in them

This ends up being translated to ?server_name= in the matrix-js-sdk, although that has a bug at the time of writing. It converts `server_name: ['a', 'b']` to `?server_name=a,b` instead of `?server_name=a&server_name=b`

For reference: the `viaServers` option is routed through the 'join_room' action to RoomViewStore#_joinRoom which is passed directly to the js-sdk http-api#joinRoom function.

Next steps:
* Fix the js-sdk parsing
* Make the SDK generate matrix.to links with ?via=
---
 src/components/structures/LoggedInView.js |  4 ++++
 src/components/structures/MatrixChat.js   | 13 +++++++++++++
 src/components/structures/RoomView.js     |  7 +++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 180a348434..d95d5cd652 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -64,6 +64,9 @@ const LoggedInView = React.createClass({
 
         teamToken: PropTypes.string,
 
+        // Used by the RoomView to handle joining rooms
+        viaServers: PropTypes.arrayOf(PropTypes.string),
+
         // and lots and lots of other stuff.
     },
 
@@ -389,6 +392,7 @@ const LoggedInView = React.createClass({
                         onRegistered={this.props.onRegistered}
                         thirdPartyInvite={this.props.thirdPartyInvite}
                         oobData={this.props.roomOobData}
+                        viaServers={this.props.viaServers}
                         eventPixelOffset={this.props.initialEventPixelOffset}
                         key={this.props.currentRoomId || 'roomview'}
                         disabled={this.props.middleDisabled}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index f385aacd40..5dbafbd2a7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -840,6 +840,7 @@ export default React.createClass({
             page_type: PageTypes.RoomView,
             thirdPartyInvite: roomInfo.third_party_invite,
             roomOobData: roomInfo.oob_data,
+            viaServers: roomInfo.via_servers,
         };
 
         if (roomInfo.room_alias) {
@@ -1488,9 +1489,21 @@ export default React.createClass({
                 inviterName: params.inviter_name,
             };
 
+            // on our URLs there might be a ?via=matrix.org or similar to help
+            // joins to the room succeed. We'll pass these through as an array
+            // to other levels. If there's just one ?via= then params.via is a
+            // single string. If someone does something like ?via=one.com&via=two.com
+            // then params.via is an array of strings.
+            let via = [];
+            if (params.via) {
+                if (typeof(params.via) === 'string') via = [params.via];
+                else via = params.via;
+            }
+
             const payload = {
                 action: 'view_room',
                 event_id: eventId,
+                via_servers: via,
                 // If an event ID is given in the URL hash, notify RoomViewStore to mark
                 // it as highlighted, which will propagate to RoomView and highlight the
                 // associated EventTile.
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8e226bdfcf..5d51b9f9a0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -88,6 +88,9 @@ module.exports = React.createClass({
 
         // is the RightPanel collapsed?
         collapsedRhs: PropTypes.bool,
+
+        // Servers the RoomView can use to try and assist joins
+        viaServers: PropTypes.arrayOf(PropTypes.string),
     },
 
     getInitialState: function() {
@@ -833,7 +836,7 @@ module.exports = React.createClass({
                 action: 'do_after_sync_prepared',
                 deferred_action: {
                     action: 'join_room',
-                    opts: { inviteSignUrl: signUrl },
+                    opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
                 },
             });
 
@@ -875,7 +878,7 @@ module.exports = React.createClass({
                 this.props.thirdPartyInvite.inviteSignUrl : undefined;
             dis.dispatch({
                 action: 'join_room',
-                opts: { inviteSignUrl: signUrl },
+                opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
             });
             return Promise.resolve();
         });

From 49efefa6307e6eb42ac64dfb0a9f7af5e8220b00 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 19 Oct 2018 14:18:05 -0600
Subject: [PATCH 042/218] Fix an error where React doesn't like value=null on a
 select

This only happens when there are no canonical aliases for a room.
---
 src/components/views/room_settings/AliasSettings.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index f9bf52cd24..92a025f10c 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -220,8 +220,9 @@ module.exports = React.createClass({
         let canonical_alias_section;
         if (this.props.canSetCanonicalAlias) {
             let found = false;
+            const canonicalValue = this.state.canonicalAlias || "";
             canonical_alias_section = (
-                <select onChange={this.onCanonicalAliasChange} value={this.state.canonicalAlias}>
+                <select onChange={this.onCanonicalAliasChange} value={canonicalValue}>
                     <option value="" key="unset">{ _t('not specified') }</option>
                     {
                         Object.keys(self.state.domainToAliases).map((domain, i) => {

From 9582c1e65a490c7797236b1740332d014a3bd66e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 19 Oct 2018 15:33:23 -0600
Subject: [PATCH 043/218] Move all dialog buttons to the right and fix their
 order

Fixes https://github.com/vector-im/riot-web/issues/5689

Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.

Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing.
---
 res/css/_common.scss                           |  5 +++++
 res/css/_components.scss                       |  1 -
 res/css/views/dialogs/_ChatInviteDialog.scss   |  8 --------
 res/css/views/dialogs/_DevtoolsDialog.scss     |  4 ++++
 res/css/views/dialogs/_QuestionDialog.scss     | 18 ------------------
 src/components/views/dialogs/DevtoolsDialog.js |  4 ++--
 src/components/views/elements/DialogButtons.js | 10 +++++-----
 7 files changed, 16 insertions(+), 34 deletions(-)
 delete mode 100644 res/css/views/dialogs/_QuestionDialog.scss

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 38f576a532..bf67edc1c3 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -222,6 +222,11 @@ textarea {
     word-wrap: break-word;
 }
 
+.mx_Dialog_buttons {
+    padding-right: 58px;
+    text-align: right;
+}
+
 .mx_Dialog button, .mx_Dialog input[type="submit"] {
     @mixin mx_DialogButton;
     margin-left: 0px;
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0e40b40a29..a09f895d5f 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -38,7 +38,6 @@
 @import "./views/dialogs/_DevtoolsDialog.scss";
 @import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
-@import "./views/dialogs/_QuestionDialog.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_SetEmailDialog.scss";
 @import "./views/dialogs/_SetMxIdDialog.scss";
diff --git a/res/css/views/dialogs/_ChatInviteDialog.scss b/res/css/views/dialogs/_ChatInviteDialog.scss
index 6fc211743d..dcc0f5921a 100644
--- a/res/css/views/dialogs/_ChatInviteDialog.scss
+++ b/res/css/views/dialogs/_ChatInviteDialog.scss
@@ -14,14 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ChatInviteDialog {
-    /* XXX: padding-left is on mx_Dialog but padding-right has subsequently
-     * been added on other dialogs. Surely all our dialogs should have consistent
-     * right hand padding?
-     */
-    padding-right: 58px;
-}
-
 /* Using a textarea for this element, to circumvent autofill */
 .mx_ChatInviteDialog_input,
 .mx_ChatInviteDialog_input:focus
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index a4a868bd11..3764bb13b3 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_DevTools_dialog {
+    padding-right: 58px;
+}
+
 .mx_DevTools_content {
     margin: 10px 0;
 }
diff --git a/res/css/views/dialogs/_QuestionDialog.scss b/res/css/views/dialogs/_QuestionDialog.scss
deleted file mode 100644
index 3d47f17592..0000000000
--- a/res/css/views/dialogs/_QuestionDialog.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-.mx_QuestionDialog {
-    padding-right: 58px;
-}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index ea198461c5..22ee44f81a 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -625,7 +625,7 @@ export default class DevtoolsDialog extends React.Component {
         let body;
 
         if (this.state.mode) {
-            body = <div>
+            body = <div className="mx_DevTools_dialog">
                 <div className="mx_DevTools_label_left">{ this.state.mode.getLabel() }</div>
                 <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
                 <div className="mx_DevTools_label_bottom" />
@@ -634,7 +634,7 @@ export default class DevtoolsDialog extends React.Component {
         } else {
             const classes = "mx_DevTools_RoomStateExplorer_button";
             body = <div>
-                <div>
+                <div className="mx_DevTools_dialog">
                     <div className="mx_DevTools_label_left">{ _t('Toolbox') }</div>
                     <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
                     <div className="mx_DevTools_label_bottom" />
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index baf831415f..f314588caa 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -70,15 +70,15 @@ module.exports = React.createClass({
         }
         return (
             <div className="mx_Dialog_buttons">
+                { cancelButton }
+                { this.props.children }
                 <button className={primaryButtonClassName}
-                    onClick={this.props.onPrimaryButtonClick}
-                    autoFocus={this.props.focus}
-                    disabled={this.props.disabled}
+                        onClick={this.props.onPrimaryButtonClick}
+                        autoFocus={this.props.focus}
+                        disabled={this.props.disabled}
                 >
                     { this.props.primaryButton }
                 </button>
-                { this.props.children }
-                { cancelButton }
             </div>
         );
     },

From 275d88dd4f4f0a7c6fea946518294183b4165858 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 19 Oct 2018 16:22:20 -0600
Subject: [PATCH 044/218] Redirect widgets to another location before deleting
 them

This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
---
 src/components/views/elements/AppTile.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 7be0bab33c..71cd65c89f 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -318,6 +318,19 @@ export default class AppTile extends React.Component {
                         }
                         this.setState({deleting: true});
 
+                        // HACK: This is a really dirty way to ensure that Jitsi cleans up
+                        // its hold on the webcam. Without this, the widget holds a media
+                        // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
+                        if (this.refs.appFrame) {
+                            // In practice we could just do `+= ''` to trick the browser
+                            // into thinking the URL changed, however I can foresee this
+                            // being optimized out by a browser. Instead, we'll just point
+                            // the iframe at a page that is reasonably safe to use in the
+                            // event the iframe doesn't wink away.
+                            // This is relative to where the Riot instance is located.
+                            this.refs.appFrame.src = '/config.json';
+                        }
+
                         WidgetUtils.setRoomWidget(
                             this.props.room.roomId,
                             this.props.id,

From c75beb01963228c21e0b4420caaa909851f555f4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 19 Oct 2018 16:22:20 -0600
Subject: [PATCH 045/218] Revert "Redirect widgets to another location before
 deleting them"

This reverts commit 275d88dd4f4f0a7c6fea946518294183b4165858.
---
 src/components/views/elements/AppTile.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 71cd65c89f..7be0bab33c 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -318,19 +318,6 @@ export default class AppTile extends React.Component {
                         }
                         this.setState({deleting: true});
 
-                        // HACK: This is a really dirty way to ensure that Jitsi cleans up
-                        // its hold on the webcam. Without this, the widget holds a media
-                        // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
-                        if (this.refs.appFrame) {
-                            // In practice we could just do `+= ''` to trick the browser
-                            // into thinking the URL changed, however I can foresee this
-                            // being optimized out by a browser. Instead, we'll just point
-                            // the iframe at a page that is reasonably safe to use in the
-                            // event the iframe doesn't wink away.
-                            // This is relative to where the Riot instance is located.
-                            this.refs.appFrame.src = '/config.json';
-                        }
-
                         WidgetUtils.setRoomWidget(
                             this.props.room.roomId,
                             this.props.id,

From 7ef08314b8d329dda6abac2e56749b233fd2860a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 19 Oct 2018 16:22:20 -0600
Subject: [PATCH 046/218] Redirect widgets to another location before deleting
 them

This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
---
 src/components/views/elements/AppTile.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 7be0bab33c..71cd65c89f 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -318,6 +318,19 @@ export default class AppTile extends React.Component {
                         }
                         this.setState({deleting: true});
 
+                        // HACK: This is a really dirty way to ensure that Jitsi cleans up
+                        // its hold on the webcam. Without this, the widget holds a media
+                        // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
+                        if (this.refs.appFrame) {
+                            // In practice we could just do `+= ''` to trick the browser
+                            // into thinking the URL changed, however I can foresee this
+                            // being optimized out by a browser. Instead, we'll just point
+                            // the iframe at a page that is reasonably safe to use in the
+                            // event the iframe doesn't wink away.
+                            // This is relative to where the Riot instance is located.
+                            this.refs.appFrame.src = '/config.json';
+                        }
+
                         WidgetUtils.setRoomWidget(
                             this.props.room.roomId,
                             this.props.id,

From 51a03a700a08eaf625d2f7f0f22af3154e555fe6 Mon Sep 17 00:00:00 2001
From: Oliwer <Lup3@xmcode.pl>
Date: Sat, 20 Oct 2018 15:16:06 +0000
Subject: [PATCH 047/218] Translated using Weblate (Polish)

Currently translated at 91.6% (1164 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 245ee0c395..cc6d7ebd84 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1146,7 +1146,7 @@
     "was invited %(count)s times|one": "został zaproszony",
     "was banned %(count)s times|one": "został zablokowany",
     "was kicked %(count)s times|one": "został wyrzucony",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Niezależnie od tego, czy używasz trybu Richtext edytora tekstu w formacie RTF",
     "Call in Progress": "Łączenie w toku",
     "Permission Required": "Wymagane Pozwolenie",
     "Registration Required": "Wymagana Rejestracja",
@@ -1155,5 +1155,28 @@
     "deleted": "przekreślenie",
     "numbered-list": "lista numerowana",
     "bulleted-list": "wykropkowana lista",
-    "block-quote": "blok cytowany"
+    "block-quote": "blok cytowany",
+    "A conference call could not be started because the intgrations server is not available": "Połączenie grupowe nie może zostać rozpoczęte, ponieważ serwer jest niedostępny",
+    "A call is currently being placed!": "W tej chwili trwa rozmowa!",
+    "A call is already in progress!": "W tej chwili trwa połączenie!",
+    "You do not have permission to start a conference call in this room": "Nie posiadasz permisji do rozpoczęcia rozmowy grupowej w tym pokoju",
+    "Unignored user": "Nieignorowany użytkownik",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Wymusza odrzucenie bieżącej sesji grupy wychodzącej w zaszyfrowanym pokoju",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s dodał %(addedAddresses)s jako adres tego pokoju.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s dodał %(addedAddresses)s jako adresy tego pokoju.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s usunął %(removedAddresses)s jako adres tego pokoju.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s usunął %(removedAddresses)s jako adresy tego pokoju.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s dodał %(addedAddresses)s i %(removedAddresses)s usunął adresy z tego pokoju.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ustawił domyślny adres dla tego pokoju jako %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s usunął domyślny adres tego pokoju.",
+    "This homeserver has hit its Monthly Active User limit.": "Ten serwer osiągnął miesięczny limit aktywnego użytkownika.",
+    "This homeserver has exceeded one of its resource limits.": "Ten serwer przekroczył jeden z limitów.",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji.",
+    "Unable to connect to Homeserver. Retrying...": "Nie można się połączyć z serwerem. Ponawanianie...",
+    "Sorry, your homeserver is too old to participate in this room.": "Przepraszamy, twój serwer jest zbyt stary by wziąć udział w tym pokoju.",
+    "Please contact your homeserver administrator.": "Proszę o kontakt z administratorem serwera.",
+    "Increase performance by only loading room members on first view": "Zwiększ wydajność, ładując tylko członków pokoju w pierwszym widoku",
+    "Enable widget screenshots on supported widgets": "Włącz widżety zrzutów ekranów na obsługiwanych widżetach",
+    "Show empty room list headings": "Pokaż nagłówki z pustym pokojem",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "W zaszyfrowanych pokojach, takich jak ten, podgląd adresów URL jest domyślnie wyłączony, aby upewnić się, że serwer (w którym generowane są podglądy) nie może zbierać informacji o linkach widocznych w tym pokoju."
 }

From 2a6ae17e6a80d5b395da6ae3f152efc9194bb862 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkkx@protonmail.com>
Date: Sat, 20 Oct 2018 15:47:21 +0000
Subject: [PATCH 048/218] Translated using Weblate (Polish)

Currently translated at 91.6% (1164 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index cc6d7ebd84..ee868b4d0b 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -143,11 +143,11 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nie można nawiązać połączenia z serwerem przy użyciu HTTP podczas korzystania z HTTPS dla bieżącej strony. Użyj HTTPS lub <a>włącz niebezpieczne skrypty</a>.",
     "Can't load user settings": "Nie można załadować ustawień użytkownika",
     "Cannot add any more widgets": "Nie można dodać już więcej widżetów",
-    "%(senderName)s changed their profile picture.": "%(senderName)s zmienił swoje zdjęcie profilowe.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmienił poziom mocy %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmienił nazwę pokoju na %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s usunął nazwę pokoju.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmienił temat na \"%(topic)s\".",
+    "%(senderName)s changed their profile picture.": "%(senderName)s zmienił(a) swoje zdjęcie profilowe.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmienił(a) poziom mocy %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmienił(a) nazwę pokoju na %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s usunął(-ęła) nazwę pokoju.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmienił(a) temat na \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Zmiany w dostępie do historii będą dotyczyć tylko przyszłych wiadomości w tym pokoju",
     "Changes your display nickname": "Zmień swój pseudonim",
     "Changes colour scheme of current room": "Zmień schemat kolorystyczny bieżącego pokoju",
@@ -370,8 +370,8 @@
     "Rejoin": "Dołącz ponownie",
     "Remote addresses for this room:": "Adresy zdalne dla tego pokoju:",
     "Remove Contact Information?": "Usunąć dane kontaktowe?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s usunął swoją nazwę ekranową (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s usunął swoje zdjęcie profilowe.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s usunął(-ęła) swoją wyświetlaną nazwę (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s usunął(-ęła) swoje zdjęcie profilowe.",
     "Remove %(threePid)s?": "Usunąć %(threePid)s?",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s zażądał grupowego połączenia głosowego VoIP.",
     "Results from DuckDuckGo": "Wyniki z DuckDuckGo",
@@ -629,9 +629,9 @@
     " (unsupported)": " (niewspierany)",
     "Idle": "Bezczynny",
     "Check for update": "Sprawdź aktualizacje",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmienił awatar pokoju na <img/>",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s usunął awatar pokoju.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmienił awatar %(roomName)s",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmienił(a) awatar pokoju na <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s usunął(-ęła) awatar pokoju.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmienił(a) awatar %(roomName)s",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "To będzie twoja nazwa konta na <span></span> serwerze domowym; możesz też wybrać <a>inny serwer</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jeśli już posiadasz konto Matrix możesz się <a>zalogować</a>.",
     "Not a valid Riot keyfile": "Niepoprawny plik klucza Riot",
@@ -640,7 +640,7 @@
     "Do you want to set an email address?": "Czy chcesz ustawić adres e-mail?",
     "To return to your account in future you need to set a password": "By móc powrócić do swojego konta w przyszłości musisz ustawić hasło",
     "Share without verifying": "Udostępnij bez weryfikacji",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Dodałeś nowe urządzenie '%(displayName)s', które żąda kluczy szyfrujących.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Dodałeś(-aś) nowe urządzenie '%(displayName)s', które żąda kluczy szyfrujących.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Twoje niezweryfikowane urządzenie '%(displayName)s' żąda kluczy szyfrujących.",
     "Encryption key request": "Żądanie klucza szyfrującego",
     "Autocomplete Delay (ms):": "Opóźnienie autouzupełniania (ms):",
@@ -700,8 +700,8 @@
     "Ignored user": "Użytkownik ignorowany",
     "You are now ignoring %(userId)s": "Ignorujesz teraz %(userId)s",
     "You are no longer ignoring %(userId)s": "Nie ignorujesz już %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s zmienił swoją wyświetlaną nazwę na %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmienił przypiętą wiadomość dla tego pokoju.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s zmienił(a) swoją wyświetlaną nazwę na %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmienił(a) przypiętą wiadomość dla tego pokoju.",
     "Message Pinning": "Przypinanie wiadomości",
     "%(names)s and %(count)s others are typing|other": "%(names)s oraz %(count)s innych piszą",
     "%(names)s and %(count)s others are typing|one": "%(names)s oraz jedna inna osoba piszą",
@@ -1162,13 +1162,13 @@
     "You do not have permission to start a conference call in this room": "Nie posiadasz permisji do rozpoczęcia rozmowy grupowej w tym pokoju",
     "Unignored user": "Nieignorowany użytkownik",
     "Forces the current outbound group session in an encrypted room to be discarded": "Wymusza odrzucenie bieżącej sesji grupy wychodzącej w zaszyfrowanym pokoju",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s dodał %(addedAddresses)s jako adres tego pokoju.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s dodał %(addedAddresses)s jako adresy tego pokoju.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s usunął %(removedAddresses)s jako adres tego pokoju.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s usunął %(removedAddresses)s jako adresy tego pokoju.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s dodał(a) %(addedAddresses)s jako adres tego pokoju.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s dodał(a) %(addedAddresses)s jako adres tego pokoju.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s usunął(-ęła) %(removedAddresses)s jako adres tego pokoju.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s usunął(-ęła) %(removedAddresses)s jako adres tego pokoju.",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s dodał %(addedAddresses)s i %(removedAddresses)s usunął adresy z tego pokoju.",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ustawił domyślny adres dla tego pokoju jako %(address)s.",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s usunął domyślny adres tego pokoju.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ustawił(a) główny adres dla tego pokoju na %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s usunął(-ęła) główny adres tego pokoju.",
     "This homeserver has hit its Monthly Active User limit.": "Ten serwer osiągnął miesięczny limit aktywnego użytkownika.",
     "This homeserver has exceeded one of its resource limits.": "Ten serwer przekroczył jeden z limitów.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji.",

From 2ac10dd6b15edc8bb9a3d782546fccb46017dae2 Mon Sep 17 00:00:00 2001
From: FeiYang <feiyang@fyol.xyz>
Date: Sat, 20 Oct 2018 09:54:35 +0000
Subject: [PATCH 049/218] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e3492d1ef6..ad14a6a94c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -165,7 +165,7 @@
     "Success": "成功",
     "The default role for new room members is": "此聊天室新成員的預設角色是",
     "The main address for this room is": "此聊天室的主要地址是",
-    "This email address is already in use": "此電子郵件地址已經被使用",
+    "This email address is already in use": "這個電子郵件位址已被使用",
     "This email address was not found": "未找到此電子郵件地址",
     "The email address linked to your account must be entered.": "必須輸入和你帳號關聯的電子郵件地址。",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "文件 '%(fileName)s' 超過了這個家伺服器的上傳大小限制",

From b3d5612746048364128a521489a1953395e3c10f Mon Sep 17 00:00:00 2001
From: Victor Grousset <victor@tuxayo.net>
Date: Sun, 21 Oct 2018 15:19:21 +0000
Subject: [PATCH 050/218] Translated using Weblate (Esperanto)

Currently translated at 86.4% (1098 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 74cd5b255f..ccbf327f59 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -251,7 +251,7 @@
     "Encrypted by a verified device": "Ĉifrita de kontrolita aparato",
     "Encrypted by an unverified device": "Ĉifrita de nekontrolita aparato",
     "Unencrypted message": "Neĉifrita mesaĝo",
-    "Please select the destination room for this message": "Bonvolu elekti celan ĉambron por ĉi tiu mesaĝo",
+    "Please select the destination room for this message": "Bonvolu elekti celan babilejon por tiu mesaĝo",
     "Blacklisted": "Senpova legi ĉifritajn mesaĝojn",
     "Verified": "Kontrolita",
     "Unverified": "Nekontrolita",
@@ -292,19 +292,19 @@
     "and %(count)s others...|other": "kaj %(count)s aliaj…",
     "and %(count)s others...|one": "kaj unu alia…",
     "Invited": "Invititaj",
-    "Filter room members": "Filtri ĉambranojn",
+    "Filter room members": "Filtri babilejanojn",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (potenco je %(powerLevelNumber)s)",
     "Attachment": "Kunsendaĵo",
     "Upload Files": "Alŝuti dosierojn",
     "Are you sure you want to upload the following files?": "Ĉu vi certe volas alŝuti la jenajn dosierojn?",
-    "Encrypted room": "Ĉifrita ĉambro",
-    "Unencrypted room": "Neĉifrita ĉambro",
+    "Encrypted room": "Ĉifrita babilejo",
+    "Unencrypted room": "Neĉifrita babilejo",
     "Hangup": "Fini vokon",
     "Voice call": "Voĉvoko",
     "Video call": "Vidvoko",
     "Upload file": "Alŝuti dosieron",
     "Show Text Formatting Toolbar": "Montri tekstaranĝan breton",
-    "You do not have permission to post to this room": "Mankas al vi permeso afiŝi en la ĉambro",
+    "You do not have permission to post to this room": "Mankas al vi permeso afiŝi en tiu babilejo",
     "Turn Markdown on": "Ŝalti Marksubon",
     "Turn Markdown off": "Malŝalti Marksubon",
     "Hide Text Formatting Toolbar": "Kaŝi tekstaranĝan breton",
@@ -339,7 +339,7 @@
     "Offline": "Eksterreta",
     "Unknown": "Nekonata",
     "Seen by %(userName)s at %(dateTime)s": "Vidita de %(userName)s je %(dateTime)s",
-    "Unnamed room": "Sennoma ĉambro",
+    "Unnamed room": "Sennoma babilejo",
     "World readable": "Legebla de ĉiuj",
     "Guests can join": "Gastoj povas aliĝi",
     "No rooms to show": "Neniuj ĉambroj montreblas",
@@ -347,11 +347,11 @@
     "Save": "Konservi",
     "(~%(count)s results)|other": "(~%(count)s rezultoj)",
     "(~%(count)s results)|one": "(~%(count)s rezulto)",
-    "Join Room": "Aliĝi al ĉambro",
+    "Join Room": "Aliĝi al Babilejo",
     "Upload avatar": "Alŝuti profilbildon",
     "Remove avatar": "Forigi profilbildon",
     "Settings": "Agordoj",
-    "Forget room": "Forgesi ĉambron",
+    "Forget room": "Forgesi babilejon",
     "Search": "Serĉi",
     "Show panel": "Montri panelon",
     "Drop here to favourite": "Demetu tien ĉi por ŝati",
@@ -453,17 +453,17 @@
     "not set": "neagordita",
     "Remote addresses for this room:": "Foraj adresoj de ĉi tiu ĉambro:",
     "Addresses": "Adresoj",
-    "The main address for this room is": "La ĉefadreso por ĉi tiu ĉambro estas",
-    "Local addresses for this room:": "Lokaj adresoj por ĉi tiu ĉambro:",
-    "This room has no local addresses": "Ĉi tiu ĉambro ne havas lokajn adresojn",
+    "The main address for this room is": "La ĉefadreso por ĉi tiu babilejo estas",
+    "Local addresses for this room:": "Lokaj adresoj por ĉi tiu babilejo:",
+    "This room has no local addresses": "Ĉi tiu babilejo ne havas lokajn adresojn",
     "New address (e.g. #foo:%(localDomain)s)": "Nova adreso (ekz-e #io:%(localDomain)s)",
     "Invalid community ID": "Malvalida komunuma identigaĵo",
     "'%(groupId)s' is not a valid community ID": "‹%(groupId)s› ne estas valida komunuma identigaĵo",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nova komunuma identigaĵo (ekz-e +io:%(localDomain)s)",
     "You have <a>enabled</a> URL previews by default.": "Vi <a>ŝaltis</a> implicitajn antaŭrigardojn al retpaĝoj.",
     "You have <a>disabled</a> URL previews by default.": "Vi <a>malŝaltis</a> implicitajn antaŭrigardojn al retpaĝoj.",
-    "URL previews are enabled by default for participants in this room.": "Antaŭrigardoj al retpaĝoj estas implicite ŝaltitaj por ĉambranoj ĉi tie.",
-    "URL previews are disabled by default for participants in this room.": "Antaŭrigardoj al retpaĝoj estas implicite malŝaltitaj por ĉambranoj ĉi tie.",
+    "URL previews are enabled by default for participants in this room.": "Antaŭrigardoj de URL-oj estas implicite ŝaltitaj por anoj de tiu ĉi babilejo.",
+    "URL previews are disabled by default for participants in this room.": "Antaŭrigardoj de URL-oj estas implicite malŝaltitaj por anoj de tiu ĉi babilejo.",
     "URL Previews": "Antaŭrigardoj al retpaĝoj",
     "Error decrypting audio": "Eraro malĉifrante sonon",
     "Error decrypting attachment": "Eraro malĉifrante kunsendaĵon",

From 83ebe3752dce748509f0cc3cbc9075296bcf177c Mon Sep 17 00:00:00 2001
From: hamster <Lup3@xmcode.pl>
Date: Sat, 20 Oct 2018 16:07:20 +0000
Subject: [PATCH 051/218] Translated using Weblate (Polish)

Currently translated at 91.8% (1166 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index ee868b4d0b..977b94c718 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1178,5 +1178,7 @@
     "Increase performance by only loading room members on first view": "Zwiększ wydajność, ładując tylko członków pokoju w pierwszym widoku",
     "Enable widget screenshots on supported widgets": "Włącz widżety zrzutów ekranów na obsługiwanych widżetach",
     "Show empty room list headings": "Pokaż nagłówki z pustym pokojem",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "W zaszyfrowanych pokojach, takich jak ten, podgląd adresów URL jest domyślnie wyłączony, aby upewnić się, że serwer (w którym generowane są podglądy) nie może zbierać informacji o linkach widocznych w tym pokoju."
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "W zaszyfrowanych pokojach, takich jak ten, podgląd adresów URL jest domyślnie wyłączony, aby upewnić się, że serwer (w którym generowane są podglądy) nie może zbierać informacji o linkach widocznych w tym pokoju.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Gdy ktoś umieści URL w wiadomości, można wyświetlić podgląd adresu URL, aby podać więcej informacji o tym łączu, takich jak tytuł, opis i obraz ze strony internetowej.",
+    "This event could not be displayed": "Ten event nie może zostać wyświetlony"
 }

From e9a62bff2ebd0398fc313a6aec0c3f8ecf2e2fe7 Mon Sep 17 00:00:00 2001
From: sergio <sergio+it@outerface.net>
Date: Sat, 20 Oct 2018 19:20:01 +0000
Subject: [PATCH 052/218] Translated using Weblate (Russian)

Currently translated at 95.9% (1219 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 25e0d0b78d..b711b43447 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1234,5 +1234,7 @@
     "Put a link back to the old room at the start of the new room so people can see old messages": "Разместим ссылку на старую комнату, чтобы люди могли видеть старые сообщения",
     "Please <a>contact your service administrator</a> to continue using this service.": "Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы продолжить использовать этот сервис.",
     "Increase performance by only loading room members on first view": "Увеличьте производительность, загрузив только список участников комнаты",
-    "Lazy loading members not supported": "Задержка загрузки элементов не поддерживается"
+    "Lazy loading members not supported": "Задержка загрузки элементов не поддерживается",
+    "Registration Required": "Требуется регистрация",
+    "You need to register to do this. Would you like to register now?": "Необходимо зарегистрироваться. Хотите зарегистрироваться?"
 }

From 4335dfea16875804fdacfd2fc5d25dedc93b27ad Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 22 Oct 2018 09:56:55 +0000
Subject: [PATCH 053/218] Translated using Weblate (English (United States))

Currently translated at 65.1% (828 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
---
 src/i18n/strings/en_US.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 6f0708f0c2..d8733ab05a 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -567,7 +567,7 @@
     "Active call (%(roomName)s)": "Active call (%(roomName)s)",
     "Accept": "Accept",
     "Add": "Add",
-    "Admin Tools": "Admin tools",
+    "Admin Tools": "Admin Tools",
     "Alias (optional)": "Alias (optional)",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
     "<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
@@ -828,5 +828,15 @@
     "Collapse panel": "Collapse panel",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
     "Checking for an update...": "Checking for an update...",
-    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here"
+    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
+    "The platform you're on": "The platform you're on",
+    "The version of Riot.im": "The version of Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Whether or not you're logged in (we don't record your user name)",
+    "Your language of choice": "Your language of choice",
+    "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
+    "Your homeserver's URL": "Your homeserver's URL",
+    "Your identity server's URL": "Your identity server's URL",
+    "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
+    "Every page you use in the app": "Every page you use in the app"
 }

From 60b1b30c5194105bcfd78744990266b431077c72 Mon Sep 17 00:00:00 2001
From: Victor Grousset <victor@tuxayo.net>
Date: Mon, 22 Oct 2018 16:58:20 +0000
Subject: [PATCH 054/218] Translated using Weblate (Esperanto)

Currently translated at 86.4% (1098 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index ccbf327f59..6835ca355c 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -360,7 +360,7 @@
     "Drop here to demote": "Demeti tien ĉi por malpligravigi",
     "Drop here to tag %(section)s": "Demeti tien ĉi por marki %(section)s",
     "Press <StartChatButton> to start a chat with someone": "Premu <StartChatButton> por komenci babilon kun iu",
-    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Vi ankoraŭ estas en neniu ĉambro! Premu <CreateRoomButton> por krei ĉambron aŭ <RoomDirectoryButton> por esplori la ĉambrujon",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Vi ankoraŭ estas en neniuj Babilejoj! Premu <CreateRoomButton> por krei Babilejon aŭ <RoomDirectoryButton> por esplori la Babilejujon",
     "Community Invites": "Komunumaj invitoj",
     "Invites": "Invitoj",
     "Favourites": "Ŝatataj",
@@ -371,7 +371,7 @@
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Ne certigeblas, ke la adreso, kien ĉi tiu invito sendiĝis, kongruas kun tiu rilata al via konto.",
     "This invitation was sent to an email address which is not associated with this account:": "Ĉi tiu invito sendiĝis al retpoŝtadreso, kiu ne rilatas al ĉi tiu konto:",
     "You may wish to login with a different account, or add this email to this account.": "Vi povas saluti per alia konto, aŭ aldoni ĉi tiun retpoŝtadreson al tiu ĉi konto.",
-    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s vin invitis al ĉi tiu ĉambro",
+    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s vin invitis al ĉi tiu babilejo",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Ĉu vi volas <acceptText>akcepti</acceptText> aŭ <declineText>rifuzi</declineText> ĉi tiun inviton?",
     "Reason: %(reasonText)s": "Kialo: %(reasonText)s",
     "Rejoin": "Realiĝi",

From 2b9a646760da91163eb22a2875f6e55453ac2e0f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 17 Oct 2018 17:50:11 +0000
Subject: [PATCH 055/218] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1271 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 8ce023f377..05dc1d479c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1294,5 +1294,6 @@
     "Clear cache and resync": "Gyorsítótár törlése és újraszinkronizálás",
     "Please accept all of the policies": "Kérlek fogadd el a felhasználói feltételeket",
     "Please review and accept the policies of this homeserver:": "Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:",
-    "Add some now": "Adj hozzá párat"
+    "Add some now": "Adj hozzá párat",
+    "Joining room...": "Belépés a szobába.."
 }

From 54f9231582bd4581fd739ef8afd19dd169eb9ab5 Mon Sep 17 00:00:00 2001
From: Maxwell Kepler <starboundshep@gmail.com>
Date: Mon, 22 Oct 2018 20:57:58 +0100
Subject: [PATCH 056/218] Added badge to GIFs
 (https://github.com/vector-im/riot-web/issues/7344)

---
 res/css/views/messages/_MImageBody.scss     | 11 +++++++++++
 res/themes/dark/css/_dark.scss              |  3 +++
 res/themes/light/css/_base.scss             |  3 +++
 src/components/views/messages/MImageBody.js |  9 +++++++--
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 4c763c5991..8752da117d 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -46,3 +46,14 @@ limitations under the License.
 .mx_MImageBody_thumbnail_spinner > * {
     transform: translate(-50%, -50%);
 }
+
+.mx_MImageBody_GIFlabel {
+    position: absolute;
+    display: block;
+    top: 0px;
+    left: 14px;
+    padding: 5px;
+    border-radius: 5px;
+    background: $imagebody-giflabel;
+    border: 2px solid $imagebody-giflabel-border;
+}
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 8ab338790e..ce334e3710 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -143,6 +143,9 @@ $lightbox-bg-color: #454545;
 $lightbox-fg-color: #ffffff;
 $lightbox-border-color: #ffffff;
 
+$imagebody-giflabel: rgba(1, 1, 1, 0.7);
+$imagebody-giflabel-border: rgba(1, 1, 1, 0.2);
+
 // unused?
 $progressbar-color: #000;
 
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
index c7fd38259c..65cdcce209 100644
--- a/res/themes/light/css/_base.scss
+++ b/res/themes/light/css/_base.scss
@@ -148,6 +148,9 @@ $lightbox-bg-color: #454545;
 $lightbox-fg-color: #ffffff;
 $lightbox-border-color: #ffffff;
 
+$imagebody-giflabel: rgba(0, 0, 0, 0.7);
+$imagebody-giflabel-border: rgba(0, 0, 0, 0.2);
+
 // unused?
 $progressbar-color: #000;
 
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 787285d932..69cff6691c 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -278,6 +278,7 @@ export default class MImageBody extends React.Component {
 
         let img = null;
         let placeholder = null;
+        let giflabel = null;
 
         // e2e image hasn't been decrypted yet
         if (content.file !== undefined && this.state.decryptedUrl === null) {
@@ -292,7 +293,7 @@ export default class MImageBody extends React.Component {
         if (thumbUrl && !this.state.imgError) {
             // Restrict the width of the thumbnail here, otherwise it will fill the container
             // which has the same width as the timeline
-            // mx_MImageBody_thumbnail resizes img to exactly container size
+            // mx_MImageBody_ resizes img to exactly container size
             img = <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
                 style={{ maxWidth: maxWidth + "px" }}
                 alt={content.body}
@@ -302,11 +303,14 @@ export default class MImageBody extends React.Component {
                 onMouseLeave={this.onImageLeave} />;
         }
 
+        if (this._isGif() && !SettingsStore.getValue("autoplayGifsAndVideos") && !this.state.hover) {
+            giflabel = <p className="mx_MImageBody_GIFlabel">GIF</p>;
+        }
+
         const thumbnail = (
             <div className="mx_MImageBody_thumbnail_container" style={{ maxHeight: maxHeight + "px" }} >
                 { /* Calculate aspect ratio, using %padding will size _container correctly */ }
                 <div style={{ paddingBottom: (100 * infoHeight / infoWidth) + '%' }} />
-
                 { showPlaceholder &&
                     <div className="mx_MImageBody_thumbnail" style={{
                         // Constrain width here so that spinner appears central to the loaded thumbnail
@@ -320,6 +324,7 @@ export default class MImageBody extends React.Component {
 
                 <div style={{display: !showPlaceholder ? undefined : 'none'}}>
                     { img }
+                    { giflabel }
                 </div>
 
                 { this.state.hover && this.getTooltip() }

From 5e9db3647ab25c1a31274c950b5e73648966660a Mon Sep 17 00:00:00 2001
From: Maxwell Kepler <starboundshep@gmail.com>
Date: Mon, 22 Oct 2018 21:03:39 +0100
Subject: [PATCH 057/218] Fixed minor typo in comment

---
 src/components/views/messages/MImageBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 69cff6691c..6cabd9bc76 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -293,7 +293,7 @@ export default class MImageBody extends React.Component {
         if (thumbUrl && !this.state.imgError) {
             // Restrict the width of the thumbnail here, otherwise it will fill the container
             // which has the same width as the timeline
-            // mx_MImageBody_ resizes img to exactly container size
+            // mx_MImageBody_thumbnail resizes img to exactly container size
             img = <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
                 style={{ maxWidth: maxWidth + "px" }}
                 alt={content.body}

From 78f527cf950a9c8ec6b27fc09b3e5b9f7e208a74 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 22 Oct 2018 15:14:21 -0600
Subject: [PATCH 058/218] Remove unused classes

---
 src/components/views/groups/GroupMemberList.js | 2 +-
 src/components/views/rooms/MemberList.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index faf172083f..38c679a5b5 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -165,7 +165,7 @@ export default React.createClass({
         return (
             <div className="mx_MemberList">
                 { inputBox }
-                <GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_outerWrapper">
+                <GeminiScrollbarWrapper autoshow={true}>
                     { joined }
                     { invited }
                 </GeminiScrollbarWrapper>
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 67a6effc81..41434cc6f9 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -447,7 +447,7 @@ module.exports = React.createClass({
         return (
             <div className="mx_MemberList">
                 { inputBox }
-                <GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper">
+                <GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_joined">
                     <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAtJoined}
                             createOverflowElement={this._createOverflowTileJoined}
                             getChildren={this._getChildrenJoined}

From 41bd6e436608cdbffbe90508c615d8cffd2d16cb Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 22 Oct 2018 20:55:21 -0500
Subject: [PATCH 059/218] Change leave room button text, OK -> Leave

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/structures/MatrixChat.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index f385aacd40..b725e5f9ab 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1034,6 +1034,7 @@ export default React.createClass({
                 { warnings }
                 </span>
             ),
+            button: _t("Leave"),
             onFinished: (shouldLeave) => {
                 if (shouldLeave) {
                     const d = MatrixClientPeg.get().leave(roomId);

From 6774fd7acc12aa1472f0ba1775f9bd9f1c0b2112 Mon Sep 17 00:00:00 2001
From: FeiYang <feiyang@fyol.xyz>
Date: Sat, 20 Oct 2018 09:54:35 +0000
Subject: [PATCH 060/218] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1271 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ad14a6a94c..ba23947fc2 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1292,5 +1292,6 @@
     "Clear cache and resync": "清除快取並重新同步",
     "Please accept all of the policies": "請接受所有政策",
     "Please review and accept the policies of this homeserver:": "請審閱並接受此家伺服器的政策：",
-    "Add some now": "現在就新增一些"
+    "Add some now": "現在就新增一些",
+    "Joining room...": "正在加入聊天室……"
 }

From 4b3c86595949b49ba278938ad18e038e2178d3ec Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 22 Oct 2018 23:07:41 -0500
Subject: [PATCH 061/218] lint: make colorScheme camel case

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/structures/MatrixChat.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index f385aacd40..dce1ac698d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1406,8 +1406,8 @@ export default React.createClass({
 
         // Fire the tinter right on startup to ensure the default theme is applied
         // A later sync can/will correct the tint to be the right value for the user
-        const color_scheme = SettingsStore.getValue("roomColor");
-        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
+        const colorScheme = SettingsStore.getValue("roomColor");
+        Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
     },
 
     /**

From cb033bcaddb08e649b2f3de804c992e7dca6ca2f Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 22 Oct 2018 23:15:28 -0500
Subject: [PATCH 062/218] Why not change it everywhere while we're at it

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/structures/RoomView.js               | 10 +++++-----
 src/settings/handlers/RoomAccountSettingsHandler.js |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 54f51c7a71..5bf6146525 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -678,8 +678,8 @@ module.exports = React.createClass({
         if (!room) return;
 
         console.log("Tinter.tint from updateTint");
-        const color_scheme = SettingsStore.getValue("roomColor", room.roomId);
-        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
+        const colorScheme = SettingsStore.getValue("roomColor", room.roomId);
+        Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
     },
 
     onAccountData: function(event) {
@@ -693,11 +693,11 @@ module.exports = React.createClass({
     onRoomAccountData: function(event, room) {
         if (room.roomId == this.state.roomId) {
             const type = event.getType();
-            if (type === "org.matrix.room.color_scheme") {
-                const color_scheme = event.getContent();
+            if (type === "org.matrix.room.colorScheme") {
+                const colorScheme = event.getContent();
                 // XXX: we should validate the event
                 console.log("Tinter.tint from onRoomAccountData");
-                Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
+                Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
             } else if (type === "org.matrix.room.preview_urls" || type === "im.vector.web.settings") {
                 // non-e2ee url previews are stored in legacy event type `org.matrix.room.preview_urls`
                 this._updatePreviewUrlVisibility(room);
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index d0dadc2de7..ae8fb79297 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -36,7 +36,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
             // The event content should already be in an appropriate format, we just need
             // to get the right value.
             // don't fallback to {} because thats truthy and would imply there is an event specifying tint
-            return this._getSettings(roomId, "org.matrix.room.color_scheme");
+            return this._getSettings(roomId, "org.matrix.room.colorScheme");
         }
 
         const settings = this._getSettings(roomId) || {};
@@ -54,7 +54,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
         // Special case room color
         if (settingName === "roomColor") {
             // The new value should match our requirements, we just need to store it in the right place.
-            return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.color_scheme", newValue);
+            return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.colorScheme", newValue);
         }
 
         const content = this._getSettings(roomId) || {};

From 1aa308595859469cd592a7166c1ac1c37f23c059 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 22 Oct 2018 23:33:33 -0500
Subject: [PATCH 063/218] Oh right, can't change these

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/structures/RoomView.js               | 2 +-
 src/settings/handlers/RoomAccountSettingsHandler.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5bf6146525..e20ac54006 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -693,7 +693,7 @@ module.exports = React.createClass({
     onRoomAccountData: function(event, room) {
         if (room.roomId == this.state.roomId) {
             const type = event.getType();
-            if (type === "org.matrix.room.colorScheme") {
+            if (type === "org.matrix.room.color_scheme") {
                 const colorScheme = event.getContent();
                 // XXX: we should validate the event
                 console.log("Tinter.tint from onRoomAccountData");
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index ae8fb79297..d0dadc2de7 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -36,7 +36,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
             // The event content should already be in an appropriate format, we just need
             // to get the right value.
             // don't fallback to {} because thats truthy and would imply there is an event specifying tint
-            return this._getSettings(roomId, "org.matrix.room.colorScheme");
+            return this._getSettings(roomId, "org.matrix.room.color_scheme");
         }
 
         const settings = this._getSettings(roomId) || {};
@@ -54,7 +54,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
         // Special case room color
         if (settingName === "roomColor") {
             // The new value should match our requirements, we just need to store it in the right place.
-            return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.colorScheme", newValue);
+            return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.color_scheme", newValue);
         }
 
         const content = this._getSettings(roomId) || {};

From 690405d3f6fa545033f8840c68ee48584ca7ecc2 Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Tue, 23 Oct 2018 05:12:50 +0000
Subject: [PATCH 064/218] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.7% (1255 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index cd8ae2f0e3..90c162e39b 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -17,7 +17,7 @@
     "Disinvite": "取消邀请",
     "Display name": "昵称",
     "Displays action": "显示操作",
-    "Don't send typing notifications": "不要发送我的打字状态",
+    "Don't send typing notifications": "不要发送“正在输入”提示",
     "Download %(text)s": "下载 %(text)s",
     "Email": "电子邮箱",
     "Email address": "邮箱地址",
@@ -488,7 +488,7 @@
     "This room is not recognised.": "无法识别此聊天室。",
     "To get started, please pick a username!": "请点击用户名！",
     "Unable to add email address": "无法添加邮箱地址",
-    "Automatically replace plain text Emoji": "文字、表情自动转换",
+    "Automatically replace plain text Emoji": "将符号表情转换为 Emoji",
     "To reset your password, enter the email address linked to your account": "要重置你的密码，请输入关联你的帐号的邮箱地址",
     "Unable to verify email address.": "无法验证邮箱地址。",
     "Unknown room %(roomId)s": "未知聊天室 %(roomId)s",
@@ -1210,7 +1210,7 @@
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "这些聊天室对社区成员可见。社区成员可通过点击来加入它们。",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "您的社区还没有详细介绍，一个展示给社区成员的 HTML 页面。<br>点击这里即可打开设置添加详细介绍！",
     "Failed to load %(groupId)s": "%(groupId)s 加载失败",
-    "This room is not public. You will not be able to rejoin without an invite.": "此聊天室不是公开的。没有邀请的话，您将无法重新加入。",
+    "This room is not public. You will not be able to rejoin without an invite.": "此聊天室不是公开聊天室。如果没有成员邀请，您将无法重新加入。",
     "Can't leave Server Notices room": "无法退出服务器公告聊天室",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "此聊天室是用于发布来自主服务器的重要讯息的，所以您不能退出它。",
     "Terms and Conditions": "条款与要求",

From a6c78ace4fbb2e64ca7935c19edf189517e3042e Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Tue, 23 Oct 2018 12:25:08 -0500
Subject: [PATCH 065/218] Add warning when administrator leaves community

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/structures/GroupView.js | 28 ++++++++-
 src/i18n/strings/en_EN.json            | 85 +++++++++++++-------------
 2 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index d104019a01..ddd3cb87bb 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -746,13 +746,37 @@ export default React.createClass({
         });
     },
 
+    _leaveGroupWarnings: function() {
+        const warnings = [];
+
+        if (this.state.isUserPrivileged) {
+            warnings.push((
+                <span className="warning">
+                    { " " /* Whitespace, otherwise the sentences get smashed together */ }
+                    { _t("You are an administrator of this community") + ". " }
+                    { _t("You will not be able to rejoin without an invite from another administrator.") }
+                </span>
+            ));
+        }
+
+        return warnings;
+    },
+
+
     _onLeaveClick: function() {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const warnings = this._leaveGroupWarnings();
+
         Modal.createTrackedDialog('Leave Group', '', QuestionDialog, {
             title: _t("Leave Community"),
-            description: _t("Leave %(groupName)s?", {groupName: this.props.groupId}),
+            description: (
+                <span>
+                { _t("Leave %(groupName)s?", {groupName: this.props.groupId}) }
+                { warnings }
+                </span>
+            ),
             button: _t("Leave"),
-            danger: true,
+            danger: this.state.isUserPrivileged,
             onFinished: async (confirmed) => {
                 if (!confirmed) return;
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e0f4663532..364aaeac9a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -43,10 +43,6 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -86,7 +82,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -211,6 +206,11 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "This homeserver has hit its Monthly Active User limit.": "This homeserver has hit its Monthly Active User limit.",
     "This homeserver has exceeded one of its resource limits.": "This homeserver has exceeded one of its resource limits.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Please <a>contact your service administrator</a> to continue using the service.",
@@ -331,31 +331,6 @@
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
-    "URL Previews": "URL Previews",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -419,6 +394,7 @@
     "Make Moderator": "Make Moderator",
     "Admin Tools": "Admin Tools",
     "Level:": "Level:",
+    "Close": "Close",
     "and %(count)s others...|other": "and %(count)s others...",
     "and %(count)s others...|one": "and one other...",
     "Invited": "Invited",
@@ -460,11 +436,11 @@
     "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -599,13 +575,37 @@
     "All Rooms": "All Rooms",
     "Cancel": "Cancel",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
-    "Add a stickerpack": "Add a stickerpack",
+    "Add some now": "Add some now",
     "Stickerpack": "Stickerpack",
     "Hide Stickers": "Hide Stickers",
     "Show Stickers": "Show Stickers",
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
-    "Close": "Close",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
+    "URL Previews": "URL Previews",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -644,7 +644,6 @@
     "Dismiss": "Dismiss",
     "To continue, please enter your password.": "To continue, please enter your password.",
     "Password:": "Password:",
-    "Please accept all of the policies": "Please accept all of the policies",
     "Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:",
     "An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s",
     "Please check your email to continue registration.": "Please check your email to continue registration.",
@@ -887,6 +886,10 @@
     "Ignore request": "Ignore request",
     "Loading device info...": "Loading device info...",
     "Encryption key request": "Encryption key request",
+    "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.",
+    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.",
+    "Incompatible local cache": "Incompatible local cache",
+    "Clear cache and resync": "Clear cache and resync",
     "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!",
     "Updating Riot": "Updating Riot",
     "Failed to upgrade room": "Failed to upgrade room",
@@ -987,7 +990,7 @@
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
     "You must join the room to see its files": "You must join the room to see its files",
     "There are no visible files in this room": "There are no visible files in this room",
-    "<h1>HTML for your community's page</h1>\r\n<p>\r\n    Use the long description to introduce new members to the community, or distribute\r\n    some important <a href=\"foo\">links</a>\r\n</p>\r\n<p>\r\n    You can even use 'img' tags\r\n</p>\r\n": "<h1>HTML for your community's page</h1>\r\n<p>\r\n    Use the long description to introduce new members to the community, or distribute\r\n    some important <a href=\"foo\">links</a>\r\n</p>\r\n<p>\r\n    You can even use 'img' tags\r\n</p>\r\n",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n",
     "Add rooms to the community summary": "Add rooms to the community summary",
     "Which rooms would you like to add to this summary?": "Which rooms would you like to add to this summary?",
     "Add to summary": "Add to summary",
@@ -1005,6 +1008,8 @@
     "Failed to update community": "Failed to update community",
     "Unable to accept invite": "Unable to accept invite",
     "Unable to join community": "Unable to join community",
+    "You are an administrator of this community": "You are an administrator of this community",
+    "You will not be able to rejoin without an invite from another administrator.": "You will not be able to rejoin without an invite from another administrator.",
     "Leave Community": "Leave Community",
     "Leave %(groupName)s?": "Leave %(groupName)s?",
     "Unable to leave community": "Unable to leave community",
@@ -1017,7 +1022,6 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
     "Join this community": "Join this community",
     "Leave this community": "Leave this community",
-    "You are an administrator of this community": "You are an administrator of this community",
     "You are a member of this community": "You are a member of this community",
     "Who can join this community?": "Who can join this community?",
     "Everyone": "Everyone",
@@ -1264,10 +1268,5 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.",
-    "Incompatible local cache": "Incompatible local cache",
-    "Clear cache and resync": "Clear cache and resync",
-    "Add some now": "Add some now"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }

From 92bfb42784393b0e83dc52740fbe2cb4248f7b26 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Tue, 23 Oct 2018 13:11:34 -0500
Subject: [PATCH 066/218] Use one string instead of two

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/structures/GroupView.js | 5 +++--
 src/i18n/strings/en_EN.json            | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index ddd3cb87bb..8a2b7a23ca 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -753,8 +753,9 @@ export default React.createClass({
             warnings.push((
                 <span className="warning">
                     { " " /* Whitespace, otherwise the sentences get smashed together */ }
-                    { _t("You are an administrator of this community") + ". " }
-                    { _t("You will not be able to rejoin without an invite from another administrator.") }
+                    { /* eslint-disable max-len */ }
+                    { _t("You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.") }
+                    { /* eslint-enable max-len */ }
                 </span>
             ));
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 364aaeac9a..2885eb68a7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1008,8 +1008,7 @@
     "Failed to update community": "Failed to update community",
     "Unable to accept invite": "Unable to accept invite",
     "Unable to join community": "Unable to join community",
-    "You are an administrator of this community": "You are an administrator of this community",
-    "You will not be able to rejoin without an invite from another administrator.": "You will not be able to rejoin without an invite from another administrator.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.",
     "Leave Community": "Leave Community",
     "Leave %(groupName)s?": "Leave %(groupName)s?",
     "Unable to leave community": "Unable to leave community",
@@ -1022,6 +1021,7 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
     "Join this community": "Join this community",
     "Leave this community": "Leave this community",
+    "You are an administrator of this community": "You are an administrator of this community",
     "You are a member of this community": "You are a member of this community",
     "Who can join this community?": "Who can join this community?",
     "Everyone": "Everyone",

From fe901142aa669e329458ec517560e11194d6b1ad Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Tue, 23 Oct 2018 17:20:54 -0500
Subject: [PATCH 067/218] Split long string over two lines

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/structures/GroupView.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 8a2b7a23ca..5d23194702 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -753,9 +753,8 @@ export default React.createClass({
             warnings.push((
                 <span className="warning">
                     { " " /* Whitespace, otherwise the sentences get smashed together */ }
-                    { /* eslint-disable max-len */ }
-                    { _t("You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.") }
-                    { /* eslint-enable max-len */ }
+                    { _t("You are an administrator of this community. You will not be " +
+                         "able to rejoin without an invite from another administrator.") }
                 </span>
             ));
         }

From ef50e05580d9c2dc09d80d8b095d4e6ddb09d7fe Mon Sep 17 00:00:00 2001
From: Victor Grousset <victor@tuxayo.net>
Date: Tue, 23 Oct 2018 12:26:40 +0000
Subject: [PATCH 068/218] Translated using Weblate (Esperanto)

Currently translated at 86.3% (1098 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 6835ca355c..84912dccf9 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -376,14 +376,14 @@
     "Reason: %(reasonText)s": "Kialo: %(reasonText)s",
     "Rejoin": "Realiĝi",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s vin forpelis de %(roomName)s.",
-    "You have been kicked from this room by %(userName)s.": "%(userName)s vin forpelis de tiu ĉi ĉambro.",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s vin forpelis de tiu babilejo.",
     "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s vi forbaris de %(roomName)s.",
-    "You have been banned from this room by %(userName)s.": "%(userName)s vin forbaris de tiu ĉi ĉambro.",
-    "This room": "Ĉi tiu ĉambro",
+    "You have been banned from this room by %(userName)s.": "%(userName)s vin forbaris de tiu babilejo.",
+    "This room": "Ĉi tiu babilejo",
     "%(roomName)s does not exist.": "%(roomName)s ne ekzistas.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s ne estas atingebla nun.",
     "You are trying to access %(roomName)s.": "Vi provas atingi %(roomName)s.",
-    "You are trying to access a room.": "Vi provas atingi ĉambron.",
+    "You are trying to access a room.": "Vi provas aliri babilejon.",
     "<a>Click here</a> to join the discussion!": "<a>Klaku ĉi tie</a> por aliĝi al la diskuto!",
     "This is a preview of this room. Room interactions have been disabled": "Tio ĉi estas antaŭrigardo al la ĉambro. Ĉambraj interagoj estas malŝaltitaj",
     "To change the room's avatar, you must be a": "Por ŝanĝi la ĉambran profilbildon, vi devas esti",
@@ -419,7 +419,7 @@
     "To link to a room it must have <a>an address</a>.": "Por esti ligebla, ĉambro devas havi <a>adreson</a>.",
     "Guests cannot join this room even if explicitly invited.": "Gastoj ne povas aliĝi ĉi tiun ĉambron eĉ kun malimplica invito.",
     "Click here to fix": "Klaku ĉi tie por riparo",
-    "Who can access this room?": "Kiu povas atingi ĉi tiun ĉambron?",
+    "Who can access this room?": "Kiu povas aliri ĉi tiun ĉambron?",
     "Only people who have been invited": "Nur invititaj uzantoj",
     "Anyone who knows the room's link, apart from guests": "Iu ajn kun la ligilo, krom gastoj",
     "Anyone who knows the room's link, including guests": "Iu ajn kun la ligilo, inkluzive gastojn",

From 819fab319832ec1ac907e92e7b65b34a76db7e65 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 Oct 2018 11:20:39 +0100
Subject: [PATCH 069/218] js-sdk rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dabaefe0ad..44d3b41ba6 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "0.12.1-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 5f8eaa37821671fba1bcd6eff034753ea3e57cfc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 Oct 2018 11:23:12 +0100
Subject: [PATCH 070/218] Prepare changelog for v0.14.2-rc.1

---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00b035ac9c..b7e5ca7adf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+Changes in [0.14.2-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.2-rc.1) (2018-10-24)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.1...v0.14.2-rc.1)
+
+ * Update from Weblate.
+   [\#2244](https://github.com/matrix-org/matrix-react-sdk/pull/2244)
+ * Show the group member list again
+   [\#2223](https://github.com/matrix-org/matrix-react-sdk/pull/2223)
+ * lint: make colorScheme camel case
+   [\#2237](https://github.com/matrix-org/matrix-react-sdk/pull/2237)
+ * Change leave room button text, OK -> Leave
+   [\#2236](https://github.com/matrix-org/matrix-react-sdk/pull/2236)
+ * Move all dialog buttons to the right and fix their order
+   [\#2231](https://github.com/matrix-org/matrix-react-sdk/pull/2231)
+ * Add a bit of text to explain the purpose of the RoomPreviewSpinner
+   [\#2225](https://github.com/matrix-org/matrix-react-sdk/pull/2225)
+ * Move the login box from the left sidebar to where the composer is
+   [\#2219](https://github.com/matrix-org/matrix-react-sdk/pull/2219)
+ * Fix an error where React doesn't like value=null on a select
+   [\#2230](https://github.com/matrix-org/matrix-react-sdk/pull/2230)
+ * add missing sticker translation
+   [\#2216](https://github.com/matrix-org/matrix-react-sdk/pull/2216)
+ * Support m.login.terms during registration
+   [\#2221](https://github.com/matrix-org/matrix-react-sdk/pull/2221)
+ * Don't show the invite nag bar when peeking
+   [\#2220](https://github.com/matrix-org/matrix-react-sdk/pull/2220)
+ * Apply the user's tint once the MatrixClientPeg is moderately ready
+   [\#2214](https://github.com/matrix-org/matrix-react-sdk/pull/2214)
+ * Make rageshake use less memory
+   [\#2217](https://github.com/matrix-org/matrix-react-sdk/pull/2217)
+ * Fix autocomplete
+   [\#2212](https://github.com/matrix-org/matrix-react-sdk/pull/2212)
+ * Explain feature states in a lot more detail
+   [\#2211](https://github.com/matrix-org/matrix-react-sdk/pull/2211)
+ * Fix various lint errors
+   [\#2213](https://github.com/matrix-org/matrix-react-sdk/pull/2213)
+
 Changes in [0.14.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.1) (2018-10-19)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.0...v0.14.1)

From 43702a48875f184cd9e7b96da2a93e345e6bca43 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 Oct 2018 11:23:57 +0100
Subject: [PATCH 071/218] v0.14.2-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 44d3b41ba6..63f275a609 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.1",
+  "version": "0.14.2-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 78d8d22457fd481e4b961e7c65cd5646c1b15557 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 Oct 2018 16:46:06 +0100
Subject: [PATCH 072/218] Fix emoji replacement in composer

 * Re-scan the slate document tree on each emoji replacement since
   doing a replacement will invalidate all the offsets we have.
 * Reset the emoji regex each time we use it.

Fixes https://github.com/vector-im/riot-web/issues/7550
---
 .../views/rooms/MessageComposerInput.js       | 56 ++++++++++++-------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 04f9299825..604c797fe4 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -573,29 +573,43 @@ export default class MessageComposerInput extends React.Component {
         }
 
         // emojioneify any emoji
-        editorState.document.getTexts().forEach(node => {
-            if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {
-                let match;
-                while ((match = EMOJI_REGEX.exec(node.text)) !== null) {
-                    const range = Range.create({
-                        anchor: {
-                            key: node.key,
-                            offset: match.index,
-                        },
-                        focus: {
-                            key: node.key,
-                            offset: match.index + match[0].length,
-                        },
-                    });
-                    const inline = Inline.create({
-                        type: 'emoji',
-                        data: { emojiUnicode: match[0] },
-                    });
-                    change = change.insertInlineAtRange(range, inline);
-                    editorState = change.value;
+        while (true) {
+            let foundEmoji = false;
+
+            for (const node of editorState.document.getTexts()) {
+                if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {
+                    let match;
+                    EMOJI_REGEX.lastIndex = 0;
+                    while ((match = EMOJI_REGEX.exec(node.text)) !== null) {
+                        const range = Range.create({
+                            anchor: {
+                                key: node.key,
+                                offset: match.index,
+                            },
+                            focus: {
+                                key: node.key,
+                                offset: match.index + match[0].length,
+                            },
+                        });
+                        const inline = Inline.create({
+                            type: 'emoji',
+                            data: { emojiUnicode: match[0] },
+                        });
+                        change = change.insertInlineAtRange(range, inline);
+                        editorState = change.value;
+
+                        // if we replaced an emoji, start again looking for more
+                        // emoji in the new editor state since doing the replacement
+                        // will change the node structure & offsets so we can't compute
+                        // insertion ranges from node.key / match.index anymore.
+                        foundEmoji = true;
+                        break;
+                    }
                 }
             }
-        });
+
+            if (!foundEmoji) break;
+        }
 
         // work around weird bug where inserting emoji via the macOS
         // emoji picker can leave the selection stuck in the emoji's

From 79d467c551c1ebaf60abed2375f9b29be0563046 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 17:36:58 +0100
Subject: [PATCH 073/218] Add button to open devtools in roomsettings

---
 src/components/views/rooms/RoomSettings.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 46869c1773..23c2dbc93d 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -590,6 +590,11 @@ module.exports = React.createClass({
         }
     },
 
+    _openDevtools: function() {
+        const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
+        Modal.createDialog(DevtoolsDialog, {roomId: this.props.room.roomId});
+    },
+
     _renderEncryptionSection: function() {
         const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
 
@@ -942,6 +947,10 @@ module.exports = React.createClass({
             </AccessibleButton>;
         }
 
+        devtoolsButton = <AccessibleButton onClick={this._openDevtools}>
+            { _t("Open Devtools") }
+        </AccessibleButton>;
+
         return (
             <div className="mx_RoomSettings">
 
@@ -1055,6 +1064,7 @@ module.exports = React.createClass({
                     { _t('Internal room ID: ') } <code>{ this.props.room.roomId }</code><br />
                     { _t('Room version number: ') } <code>{ this.props.room.getVersion() }</code><br />
                     { roomUpgradeButton }
+                    { devtoolsButton }
                 </div>
             </div>
         );

From 06c34cff9c2e7dddca4b69f2826dfbd3b218a3d7 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 17:37:13 +0100
Subject: [PATCH 074/218] Add devtools string

---
 src/i18n/strings/en_EN.json | 3 ++-
 src/i18n/strings/en_US.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2885eb68a7..cbb688f448 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1268,5 +1268,6 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
+    "Open Devtools": "Open Devtools",
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index d8733ab05a..9146fdf586 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -838,5 +838,6 @@
     "Your homeserver's URL": "Your homeserver's URL",
     "Your identity server's URL": "Your identity server's URL",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
-    "Every page you use in the app": "Every page you use in the app"
+    "Every page you use in the app": "Every page you use in the app",
+    "Open Devtools": "Open Devtools"
 }

From 44a41b589d55a3cb8cbc7828353ddc75ad3f2a13 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 17:50:15 +0100
Subject: [PATCH 075/218] Comma on strings and styling button

---
 res/css/views/rooms/_RoomSettings.scss     | 7 +++++++
 src/components/views/rooms/RoomSettings.js | 2 +-
 src/i18n/strings/en_EN.json                | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_RoomSettings.scss b/res/css/views/rooms/_RoomSettings.scss
index f04042ea77..b3858f3ba7 100644
--- a/res/css/views/rooms/_RoomSettings.scss
+++ b/res/css/views/rooms/_RoomSettings.scss
@@ -28,6 +28,13 @@ limitations under the License.
     margin-right: 8px;
 }
 
+.mx_RoomSettings_devtoolsButton {
+    @mixin mx_DialogButton;
+    position: relative;
+    padding: 4px 1.5em;
+    margin-top: 8px;
+}
+
 .mx_RoomSettings_upgradeButton,
 .mx_RoomSettings_leaveButton:hover,
 .mx_RoomSettings_unbanButton:hover {
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 23c2dbc93d..774d136e45 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -947,7 +947,7 @@ module.exports = React.createClass({
             </AccessibleButton>;
         }
 
-        devtoolsButton = <AccessibleButton onClick={this._openDevtools}>
+        const devtoolsButton = <AccessibleButton className="mx_RoomSettings_devtoolsButton" onClick={this._openDevtools}>
             { _t("Open Devtools") }
         </AccessibleButton>;
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cbb688f448..45fb0351a7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1269,5 +1269,5 @@
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
     "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "Open Devtools": "Open Devtools",
+    "Open Devtools": "Open Devtools"
 }

From 3c045f3f65f4940889d1a646fafeb85f544173fb Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 18:02:45 +0100
Subject: [PATCH 076/218] Revert i18n changes for en_US

---
 src/i18n/strings/en_US.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 9146fdf586..d8733ab05a 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -838,6 +838,5 @@
     "Your homeserver's URL": "Your homeserver's URL",
     "Your identity server's URL": "Your identity server's URL",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
-    "Every page you use in the app": "Every page you use in the app",
-    "Open Devtools": "Open Devtools"
+    "Every page you use in the app": "Every page you use in the app"
 }

From a5ae599dcb819c0c919af61065d998c652934bb4 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 18:15:25 +0100
Subject: [PATCH 077/218] Add show developer tools option

---
 src/settings/Settings.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 021942c6f2..547c71bac8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -290,4 +290,9 @@ export const SETTINGS = {
         displayName: _td('Show empty room list headings'),
         default: true,
     },
+    "showDeveloperTools": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Show developer tools'),
+        default: false,
+    },
 };

From 8118a9c71a394665a1497e9408d9a2b6d54fb1d5 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 18:15:35 +0100
Subject: [PATCH 078/218] Wall devtools button behind a setting

---
 src/components/views/rooms/RoomSettings.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 774d136e45..b69938a117 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -947,9 +947,10 @@ module.exports = React.createClass({
             </AccessibleButton>;
         }
 
-        const devtoolsButton = <AccessibleButton className="mx_RoomSettings_devtoolsButton" onClick={this._openDevtools}>
+        const devtoolsButton = SettingsStore.getValue("showDeveloperTools") ?
+        (<AccessibleButton className="mx_RoomSettings_devtoolsButton" onClick={this._openDevtools}>
             { _t("Open Devtools") }
-        </AccessibleButton>;
+        </AccessibleButton>) : null;
 
         return (
             <div className="mx_RoomSettings">

From 27a0f0ca62ab93b2390556003406fdc9f98434e0 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 18:16:55 +0100
Subject: [PATCH 079/218] Add i18n string

---
 src/i18n/strings/en_EN.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 45fb0351a7..8e1f75f25c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1269,5 +1269,6 @@
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
     "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "Open Devtools": "Open Devtools"
+    "Open Devtools": "Open Devtools",
+    "Show developer tools": "Show developer tools"
 }

From def0b2d8fb393bfa027b605f04b4ebc819763a92 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 24 Oct 2018 18:20:16 +0100
Subject: [PATCH 080/218] Add developertools option to UserSettings

---
 src/components/structures/UserSettings.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 129278907f..f32026511b 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -82,6 +82,7 @@ const SIMPLE_SETTINGS = [
     { id: "TagPanel.disableTagPanel" },
     { id: "enableWidgetScreenshots" },
     { id: "RoomSubList.showEmpty" },
+    { id: "showDeveloperTools" },
 ];
 
 // These settings must be defined in SettingsStore

From 5d35ce944936d1c6598ac261d1696dcba6c99afe Mon Sep 17 00:00:00 2001
From: Maxwell Kepler <starboundshep@gmail.com>
Date: Wed, 24 Oct 2018 19:06:48 +0100
Subject: [PATCH 081/218] Changed letter case.

---
 res/css/views/messages/_MImageBody.scss     | 2 +-
 src/components/views/messages/MImageBody.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 8752da117d..a5a1e66a3b 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -47,7 +47,7 @@ limitations under the License.
     transform: translate(-50%, -50%);
 }
 
-.mx_MImageBody_GIFlabel {
+.mx_MImageBody_gifLabel {
     position: absolute;
     display: block;
     top: 0px;
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 6cabd9bc76..dc891b86ff 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -278,7 +278,7 @@ export default class MImageBody extends React.Component {
 
         let img = null;
         let placeholder = null;
-        let giflabel = null;
+        let gifLabel = null;
 
         // e2e image hasn't been decrypted yet
         if (content.file !== undefined && this.state.decryptedUrl === null) {
@@ -304,7 +304,7 @@ export default class MImageBody extends React.Component {
         }
 
         if (this._isGif() && !SettingsStore.getValue("autoplayGifsAndVideos") && !this.state.hover) {
-            giflabel = <p className="mx_MImageBody_GIFlabel">GIF</p>;
+            gifLabel = <p className="mx_MImageBody_gifLabel">GIF</p>;
         }
 
         const thumbnail = (
@@ -324,7 +324,7 @@ export default class MImageBody extends React.Component {
 
                 <div style={{display: !showPlaceholder ? undefined : 'none'}}>
                     { img }
-                    { giflabel }
+                    { gifLabel }
                 </div>
 
                 { this.state.hover && this.getTooltip() }

From 2707fcc575e8daec081584961bc27abac16b8f71 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 24 Oct 2018 18:17:10 +0000
Subject: [PATCH 082/218] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1272 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 05dc1d479c..ce1cb211f3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1295,5 +1295,8 @@
     "Please accept all of the policies": "Kérlek fogadd el a felhasználói feltételeket",
     "Please review and accept the policies of this homeserver:": "Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:",
     "Add some now": "Adj hozzá párat",
-    "Joining room...": "Belépés a szobába.."
+    "Joining room...": "Belépés a szobába..",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Te vagy ennek a közösségnek az adminisztrátora. Egy másik adminisztrátortól kapott meghívó nélkül nem tudsz majd újra csatlakozni.",
+    "Open Devtools": "Fejlesztői eszközök megnyitása",
+    "Show developer tools": "Fejlesztői eszközök megjelenítése"
 }

From a8782120fe8a591fb126cee2dc16b8c9dba18c0e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 24 Oct 2018 16:57:16 -0600
Subject: [PATCH 083/218] Install memfs because webpack is made of fail

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index dabaefe0ad..03311a50e3 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
     "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "memfs": "^2.10.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From e8cb636631b8830002f3b429d896608ce5182e6c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 24 Oct 2018 18:01:08 -0600
Subject: [PATCH 084/218] Pick servers for ?via on matrix.to links based on
 some heuristics

---
 src/matrix-to.js       |  84 ++++++++++++++++++++++-
 test/matrix-to-test.js | 148 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 230 insertions(+), 2 deletions(-)
 create mode 100644 test/matrix-to-test.js

diff --git a/src/matrix-to.js b/src/matrix-to.js
index 90b0a66090..706363a251 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -14,11 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import MatrixClientPeg from "./MatrixClientPeg";
+
 export const host = "matrix.to";
 export const baseUrl = `https://${host}`;
 
 export function makeEventPermalink(roomId, eventId) {
-    return `${baseUrl}/#/${roomId}/${eventId}`;
+    const serverCandidates = pickServerCandidates(roomId);
+    return `${baseUrl}/#/${roomId}/${eventId}?${encodeServerCandidates(serverCandidates)}`;
 }
 
 export function makeUserPermalink(userId) {
@@ -26,9 +29,86 @@ export function makeUserPermalink(userId) {
 }
 
 export function makeRoomPermalink(roomId) {
-    return `${baseUrl}/#/${roomId}`;
+    const serverCandidates = pickServerCandidates(roomId);
+    return `${baseUrl}/#/${roomId}?${encodeServerCandidates(serverCandidates)}`;
 }
 
 export function makeGroupPermalink(groupId) {
     return `${baseUrl}/#/${groupId}`;
 }
+
+export function encodeServerCandidates(candidates) {
+    if (!candidates) return '';
+    return `via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`
+}
+
+export function pickServerCandidates(roomId) {
+    const client = MatrixClientPeg.get();
+    const room = client.getRoom(roomId);
+    if (!room) return [];
+
+    // Permalinks can have servers appended to them so that the user
+    // receiving them can have a fighting chance at joining the room.
+    // These servers are called "candidates" at this point because
+    // it is unclear whether they are going to be useful to actually
+    // join in the future.
+    //
+    // We pick 3 servers based on the following criteria:
+    //
+    //   Server 1: The highest power level user in the room, provided
+    //   they are at least PL 50. We don't calculate "what is a moderator"
+    //   here because it is less relevant for the vast majority of rooms.
+    //   We also want to ensure that we get an admin or high-ranking mod
+    //   as they are less likely to leave the room. If no user happens
+    //   to meet this criteria, we'll pick the most popular server in the
+    //   room.
+    //
+    //   Server 2: The next most popular server in the room (in user
+    //   distribution). This will probably be matrix.org in most cases
+    //   although it is certainly possible to be some other server. This
+    //   cannot be the same as Server 1. If no other servers are available
+    //   then we'll only return Server 1.
+    //
+    //   Server 3: The next most popular server by user distribution. This
+    //   has the same rules as Server 2, with the added exception that it
+    //   must be unique from Server 1 and 2.
+
+    // Rationale for popular servers: It's hard to get rid of people when
+    // they keep flocking in from a particular server. Sure, the server could
+    // be ACL'd in the future or for some reason be evicted from the room
+    // however an event like that is unlikely the larger the room gets.
+
+    // Note: Users receiving permalinks that happen to have all 3 potential
+    // servers fail them (in terms of joining) are somewhat expected to hunt
+    // down the person who gave them the link to ask for a participating server.
+    // The receiving user can then manually append the known-good server to
+    // the list and magically have the link work.
+
+    const populationMap: {[server:string]:number} = {};
+    const highestPlUser = {userId:null, powerLevel: 0, serverName: null};
+
+    for (const member of room.getJoinedMembers()) {
+        const serverName = member.userId.split(":").splice(1).join(":");
+        if (member.powerLevel > highestPlUser.powerLevel) {
+            highestPlUser.userId = member.userId;
+            highestPlUser.powerLevel = member.powerLevel;
+            highestPlUser.serverName = serverName;
+        }
+
+        if (!populationMap[serverName]) populationMap[serverName] = 0;
+        populationMap[serverName]++;
+    }
+
+    const candidates = [];
+    if (highestPlUser.powerLevel >= 50) candidates.push(highestPlUser.serverName);
+
+    const maxCandidates = 3;
+    const serversByPopulation = Object.keys(populationMap)
+        .sort((a, b) => populationMap[a] - populationMap[b])
+        .filter(a => !candidates.includes(a));
+    while(candidates.length < maxCandidates && candidates.length <= serversByPopulation.length) {
+        candidates.push(serversByPopulation[Math.max(0, candidates.length - 1)]);
+    }
+
+    return candidates;
+}
\ No newline at end of file
diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
new file mode 100644
index 0000000000..9b17a37860
--- /dev/null
+++ b/test/matrix-to-test.js
@@ -0,0 +1,148 @@
+/*
+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 expect from 'expect';
+import peg from '../src/MatrixClientPeg';
+import {pickServerCandidates} from "../src/matrix-to";
+
+
+describe('matrix-to', function () {
+    it('should pick no candidate servers when the room is not found', function () {
+        //peg.getRoom = () => null;
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(0);
+    });
+    it('should pick no candidate servers when the room has no members', function () {
+        peg.getRoom = () => {
+            return {
+                getJoinedMembers: () => [],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(0);
+    });
+    it('should pick no candidate servers when no users have enough power level', function () {
+        peg.getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:example.org",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@bob:example.org",
+                        powerLevel: 25,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(0);
+    });
+    it('should pick a candidate server for the highest power level user in the room', function () {
+        peg.getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:pl_50",
+                        powerLevel: 50,
+                    },
+                    {
+                        userId: "@alice:pl_75",
+                        powerLevel: 75,
+                    },
+                    {
+                        userId: "@alice:pl_95",
+                        powerLevel: 95,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(3);
+        expect(pickedServers[0]).toBe("pl_95");
+        // we don't check the 2nd and 3rd servers because that is done by the next test
+    });
+    it('should pick candidate servers based on user population', function () {
+        peg.getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:first",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@bob:first",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@charlie:first",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@alice:second",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@bob:second",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@charlie:third",
+                        powerLevel: 0,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(3);
+        expect(pickedServers[0]).toBe("first");
+        expect(pickedServers[1]).toBe("second");
+        expect(pickedServers[2]).toBe("third");
+    });
+    it('should pick prefer candidate servers with higher power levels', function () {
+        peg.getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:first",
+                        powerLevel: 100,
+                    },
+                    {
+                        userId: "@alice:second",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@bob:second",
+                        powerLevel: 0,
+                    },
+                    {
+                        userId: "@charlie:third",
+                        powerLevel: 0,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(3);
+        expect(pickedServers[0]).toBe("first");
+        expect(pickedServers[1]).toBe("second");
+        expect(pickedServers[2]).toBe("third");
+    });
+});

From 401f6333ed18e0981a0c3fff2936e303d9e1fef3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 Oct 2018 14:54:32 +0100
Subject: [PATCH 085/218] Do...while loops are a thing

---
 src/components/views/rooms/MessageComposerInput.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 604c797fe4..792dcede8a 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -573,7 +573,7 @@ export default class MessageComposerInput extends React.Component {
         }
 
         // emojioneify any emoji
-        while (true) {
+        do {
             let foundEmoji = false;
 
             for (const node of editorState.document.getTexts()) {
@@ -607,9 +607,7 @@ export default class MessageComposerInput extends React.Component {
                     }
                 }
             }
-
-            if (!foundEmoji) break;
-        }
+        } while (foundEmoji);
 
         // work around weird bug where inserting emoji via the macOS
         // emoji picker can leave the selection stuck in the emoji's

From 5e81e5b8b84ff3954bb9b19cffeb80b679cabc44 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 Oct 2018 15:07:19 +0100
Subject: [PATCH 086/218] Fix variable scope

---
 src/components/views/rooms/MessageComposerInput.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 792dcede8a..570cb8a59b 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -573,8 +573,9 @@ export default class MessageComposerInput extends React.Component {
         }
 
         // emojioneify any emoji
+        let foundEmoji;
         do {
-            let foundEmoji = false;
+            foundEmoji = false;
 
             for (const node of editorState.document.getTexts()) {
                 if (node.text !== '' && HtmlUtils.containsEmoji(node.text)) {

From 4e5ed99fec858c1fbe5d7f98fff111e956a8ec3d Mon Sep 17 00:00:00 2001
From: Jessica Wan <jessicawan2015@outlook.com>
Date: Thu, 25 Oct 2018 12:19:41 +0000
Subject: [PATCH 087/218] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.6% (1255 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 90c162e39b..e062663cad 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -155,7 +155,7 @@
     "New password": "新密码",
     "Add a topic": "添加主题",
     "Admin": "管理员",
-    "Admin Tools": "管理工具",
+    "Admin Tools": "管理员工具",
     "VoIP": "IP 电话",
     "Missing Media Permissions, click here to request.": "没有媒体存储权限，点此获取。",
     "No Microphones detected": "未检测到麦克风",
@@ -424,7 +424,7 @@
     "Unable to capture screen": "无法录制屏幕",
     "Unable to enable Notifications": "无法启用通知",
     "Unable to load device list": "无法加载设备列表",
-    "Undecryptable": "无法解密的",
+    "Undecryptable": "无法解密",
     "Unencrypted room": "未加密的聊天室",
     "unencrypted": "未加密的",
     "Unencrypted message": "未加密消息",
@@ -498,7 +498,7 @@
     "Use with caution": "谨慎使用",
     "User Interface": "用户界面",
     "User name": "用户名",
-    "(no answer)": "（无响应）",
+    "(no answer)": "（无回复）",
     "(warning: cannot be disabled again!)": "（警告：无法再被禁用！）",
     "WARNING: Device already verified, but keys do NOT MATCH!": "警告：设备已验证，但密钥不匹配！",
     "Who can access this room?": "谁有权访问此聊天室？",
@@ -807,7 +807,7 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "从其他设备上 <requestLink>重新请求密钥</requestLink>。",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果您是房间中最后一位有权限的用户，在您降低自己的权限等级后将无法撤回此修改，因为你将无法重新获得权限。",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "您将无法撤回此修改，因为您正在将此用户的滥权等级提升至与你相同。",
-    "No devices with registered encryption keys": "没有设备有已注册的加密密钥",
+    "No devices with registered encryption keys": "没有已注册加密密钥的设备",
     "Unmute": "取消静音",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（滥权等级 %(powerLevelNumber)s）",
     "Hide Stickers": "隐藏贴图",
@@ -817,15 +817,15 @@
     "%(duration)sh": "%(duration)s 小时",
     "%(duration)sd": "%(duration)s 天",
     "Online for %(duration)s": "已上线 %(duration)s",
-    "Idle for %(duration)s": "已 idle %(duration)s",
+    "Idle for %(duration)s": "已闲置%(duration)s",
     "Offline for %(duration)s": "已离线 %(duration)s",
-    "Unknown for %(duration)s": "在线状态未知 %(duration)s",
+    "Unknown for %(duration)s": "未知状态 %(duration)s",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) 在 %(dateTime)s 看到这里",
     "Remove avatar": "移除头像",
     "Drop here to favourite": "拖动到这里以加入收藏",
     "Drop here to tag direct chat": "拖动到这里以加入私聊",
     "Drop here to restore": "拖动到这里以还原",
-    "Drop here to demote": "拖动到这里以加入低优先级",
+    "Drop here to demote": "拖动到这里以降低优先级",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "无法确定此邀请发送给的邮件地址是否与您帐户所关联的邮件地址相匹配。",
     "You have been kicked from this room by %(userName)s.": "您已被 %(userName)s 从此聊天室中移除。",
     "'%(groupId)s' is not a valid community ID": "“%(groupId)s” 不是有效的社区 ID",
@@ -885,7 +885,7 @@
     "To change the room's avatar, you must be a": "无法修改此聊天室的头像，因为您不是此聊天室的",
     "To change the room's name, you must be a": "无法修改此聊天室的名称，因为您不是此聊天室的",
     "To change the room's main address, you must be a": "无法修改此聊天室的主地址，因为您不是此聊天室的",
-    "To change the room's history visibility, you must be a": "无法修改此聊天室的历史聊天记录可见性，因为您不是此聊天室的",
+    "To change the room's history visibility, you must be a": "无法更改本聊天室历史记录的可见性，您必须为",
     "To change the permissions in the room, you must be a": "无法修改此聊天室中的权限情况，因为您不是此聊天室的",
     "Showing flair for these communities:": "为这些社区显示 flair：",
     "This room is not showing flair for any communities": "此聊天室没有对任何社区显示  flair",
@@ -1150,7 +1150,7 @@
     "A call is currently being placed!": "已发起一次通话！",
     "Permission Required": "需要权限",
     "You do not have permission to start a conference call in this room": "您没有在此聊天室发起通话会议的权限",
-    "Show empty room list headings": "为空的聊天室列表显示 heading",
+    "Show empty room list headings": "为空的聊天室列表显示标题",
     "This event could not be displayed": "无法显示此事件",
     "Share Link to User": "分享链接给其他用户",
     "deleted": "删除线",

From 694f04b6cb1f0aa2db70856cc151b58d99f3a51c Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkkx@protonmail.com>
Date: Thu, 25 Oct 2018 07:34:39 +0000
Subject: [PATCH 088/218] Translated using Weblate (Polish)

Currently translated at 92.7% (1180 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 977b94c718..148392117c 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1180,5 +1180,18 @@
     "Show empty room list headings": "Pokaż nagłówki z pustym pokojem",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "W zaszyfrowanych pokojach, takich jak ten, podgląd adresów URL jest domyślnie wyłączony, aby upewnić się, że serwer (w którym generowane są podglądy) nie może zbierać informacji o linkach widocznych w tym pokoju.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Gdy ktoś umieści URL w wiadomości, można wyświetlić podgląd adresu URL, aby podać więcej informacji o tym łączu, takich jak tytuł, opis i obraz ze strony internetowej.",
-    "This event could not be displayed": "Ten event nie może zostać wyświetlony"
+    "This event could not be displayed": "Ten event nie może zostać wyświetlony",
+    "This room has been replaced and is no longer active.": "Ten pokój został zamieniony i nie jest już aktywny.",
+    "The conversation continues here.": "Konwersacja jest kontynuowana tutaj.",
+    "System Alerts": "Alerty systemowe",
+    "You don't currently have any stickerpacks enabled": "Nie masz obecnie włączonych żadnych pakietów naklejek",
+    "Stickerpack": "Pakiet naklejek",
+    "This room is a continuation of another conversation.": "Ten pokój jest kontynuacją innej rozmowy.",
+    "Click here to see older messages.": "Kliknij tutaj, aby zobaczyć starsze wiadomości.",
+    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Ten serwer osiągnął miesięczny limit aktywnych użytkowników, więc <b>niektórzy użytkownicy nie będą mogli się zalogować</b>.",
+    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Ten serwer przekroczył jeden z limitów, więc <b>niektórzy użytkownicy nie będą mogli się zalogować</b>.",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s dołączyli(-ły) %(count)s razy",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s dołączył(a) %(count)s razy",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s dołączył(a)",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s wyszli(-ły)"
 }

From 4eb93633484665acfe66a8c909c2a5f5e3783f61 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 25 Oct 2018 15:33:28 +0000
Subject: [PATCH 089/218] Translated using Weblate (Basque)

Currently translated at 100.0% (1272 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 5adbe476e7..0d25b988ad 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1292,5 +1292,9 @@
     "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Rioten beste bertsioa oraindik beste fitxat batean irekita badago, itxi ezazu zerbitzari bera aldi berean karga alferra gaituta eta desgaituta erabiltzeak arazoak sor ditzakeelako.",
     "Incompatible local cache": "Katxe lokal bateraezina",
     "Clear cache and resync": "Garbitu katxea eta sinkronizatu berriro",
-    "Add some now": "Gehitu batzuk orain"
+    "Add some now": "Gehitu batzuk orain",
+    "Joining room...": "Gelara elkartzen...",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Komunitate honen administratzailea zara. Ezin izango duzu berriro elkartu ez bazaitu beste administratzaile batek gonbidatzen.",
+    "Open Devtools": "Ireki garapen tresnak",
+    "Show developer tools": "Erakutsi garapen tresnak"
 }

From 206ad3159c6f1b41ebf1770dcb394d7cea77da30 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 25 Oct 2018 17:47:38 +0200
Subject: [PATCH 090/218] disable e2e tests for PRs targeted at experimental
 (redesign)

---
 .travis-test-riot.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh
index 7f2660a906..6cd073a1f8 100755
--- a/.travis-test-riot.sh
+++ b/.travis-test-riot.sh
@@ -27,12 +27,15 @@ npm run build
 npm run test
 popd
 
-# run end to end tests
-git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master
-pushd matrix-react-end-to-end-tests
-ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
-# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
-# CHROME_PATH=$(which google-chrome-stable) ./run.sh
-./install.sh
-./run.sh --travis
-popd
+if [ "$TRAVIS_BRANCH" != "experimental" ]
+then
+    # run end to end tests
+    git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master
+    pushd matrix-react-end-to-end-tests
+    ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
+    # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
+    # CHROME_PATH=$(which google-chrome-stable) ./run.sh
+    ./install.sh
+    ./run.sh --travis
+    popd
+fi

From 54ff5d8f256cfb1c34f518430ab62ab6df9c6ba0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 25 Oct 2018 15:21:18 -0600
Subject: [PATCH 091/218] Fix Karma/Webpack so it can build the tests

---
 karma.conf.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/karma.conf.js b/karma.conf.js
index 4d699599cb..41ddbdf249 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -199,12 +199,25 @@ module.exports = function (config) {
 
                     'matrix-react-sdk': path.resolve('test/skinned-sdk.js'),
                     'sinon': 'sinon/pkg/sinon.js',
+
+                    // To make webpack happy
+                    // Related: https://github.com/request/request/issues/1529
+                    // (there's no mock available for fs, so we fake a mock by using
+                    // an in-memory version of fs)
+                    "fs": "memfs",
                 },
                 modules: [
                     path.resolve('./test'),
                     "node_modules"
                 ],
             },
+            node: {
+                // Because webpack is made of fail
+                // https://github.com/request/request/issues/1529
+                // Note: 'mock' is the new 'empty'
+                net: 'mock',
+                tls: 'mock'
+            },
             devtool: 'inline-source-map',
             externals: {
                 // Don't try to bundle electron: leave it as a commonjs dependency

From b9bfbdc22d70ef8af96a3b331d6f24a09ee1363b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 25 Oct 2018 15:22:28 -0600
Subject: [PATCH 092/218] Fix the tests so they actually test something

---
 test/matrix-to-test.js | 46 ++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
index 9b17a37860..3bf6b5af6f 100644
--- a/test/matrix-to-test.js
+++ b/test/matrix-to-test.js
@@ -14,17 +14,31 @@ limitations under the License.
 import expect from 'expect';
 import peg from '../src/MatrixClientPeg';
 import {pickServerCandidates} from "../src/matrix-to";
+import * as testUtils from "./test-utils";
 
 
 describe('matrix-to', function () {
+    let sandbox;
+
+    beforeEach(function() {
+        testUtils.beforeEach(this);
+        sandbox = testUtils.stubClient();
+        peg.get().credentials = { userId: "@test:example.com" };
+    });
+
+    afterEach(function() {
+        sandbox.restore();
+    });
+
     it('should pick no candidate servers when the room is not found', function () {
-        //peg.getRoom = () => null;
+        peg.get().getRoom = () => null;
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
         expect(pickedServers.length).toBe(0);
     });
+
     it('should pick no candidate servers when the room has no members', function () {
-        peg.getRoom = () => {
+        peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [],
             }
@@ -33,27 +47,9 @@ describe('matrix-to', function () {
         expect(pickedServers).toExist();
         expect(pickedServers.length).toBe(0);
     });
-    it('should pick no candidate servers when no users have enough power level', function () {
-        peg.getRoom = () => {
-            return {
-                getJoinedMembers: () => [
-                    {
-                        userId: "@alice:example.org",
-                        powerLevel: 0,
-                    },
-                    {
-                        userId: "@bob:example.org",
-                        powerLevel: 25,
-                    }
-                ],
-            }
-        };
-        const pickedServers = pickServerCandidates("!somewhere:example.org");
-        expect(pickedServers).toExist();
-        expect(pickedServers.length).toBe(0);
-    });
+
     it('should pick a candidate server for the highest power level user in the room', function () {
-        peg.getRoom = () => {
+        peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {
@@ -77,8 +73,9 @@ describe('matrix-to', function () {
         expect(pickedServers[0]).toBe("pl_95");
         // we don't check the 2nd and 3rd servers because that is done by the next test
     });
+
     it('should pick candidate servers based on user population', function () {
-        peg.getRoom = () => {
+        peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {
@@ -115,8 +112,9 @@ describe('matrix-to', function () {
         expect(pickedServers[1]).toBe("second");
         expect(pickedServers[2]).toBe("third");
     });
+
     it('should pick prefer candidate servers with higher power levels', function () {
-        peg.getRoom = () => {
+        peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {

From 43980addd008aa78d353bc632c43f1ca3d3751e5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 25 Oct 2018 15:22:52 -0600
Subject: [PATCH 093/218] Add hostname sanity tests

In the event someone changes how the hostname parsing works.
---
 test/matrix-to-test.js | 85 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
index 3bf6b5af6f..dbe7fa55ff 100644
--- a/test/matrix-to-test.js
+++ b/test/matrix-to-test.js
@@ -143,4 +143,89 @@ describe('matrix-to', function () {
         expect(pickedServers[1]).toBe("second");
         expect(pickedServers[2]).toBe("third");
     });
+
+    it('should work with IPv4 hostnames', function () {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:127.0.0.1",
+                        powerLevel: 100,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(1);
+        expect(pickedServers[0]).toBe("127.0.0.1");
+    });
+
+    it('should work with IPv6 hostnames', function () {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:[::1]",
+                        powerLevel: 100,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(1);
+        expect(pickedServers[0]).toBe("[::1]");
+    });
+
+    it('should work with IPv4 hostnames with ports', function () {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:127.0.0.1:8448",
+                        powerLevel: 100,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(1);
+        expect(pickedServers[0]).toBe("127.0.0.1:8448");
+    });
+
+    it('should work with IPv6 hostnames with ports', function () {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:[::1]:8448",
+                        powerLevel: 100,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(1);
+        expect(pickedServers[0]).toBe("[::1]:8448");
+    });
+
+    it('should work with hostnames with ports', function () {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:example.org:8448",
+                        powerLevel: 100,
+                    }
+                ],
+            }
+        };
+        const pickedServers = pickServerCandidates("!somewhere:example.org");
+        expect(pickedServers).toExist();
+        expect(pickedServers.length).toBe(1);
+        expect(pickedServers[0]).toBe("example.org:8448");
+    });
 });

From 52094964a01897a0c65ca82f1ef8123808efc6f3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 25 Oct 2018 15:23:15 -0600
Subject: [PATCH 094/218] Fix the server candidate picker to actually work

Tests do wonders.
---
 src/matrix-to.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/matrix-to.js b/src/matrix-to.js
index 706363a251..881972410f 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -102,12 +102,15 @@ export function pickServerCandidates(roomId) {
     const candidates = [];
     if (highestPlUser.powerLevel >= 50) candidates.push(highestPlUser.serverName);
 
+    const beforePopulation = candidates.length;
     const maxCandidates = 3;
     const serversByPopulation = Object.keys(populationMap)
-        .sort((a, b) => populationMap[a] - populationMap[b])
+        .sort((a, b) => populationMap[b] - populationMap[a])
         .filter(a => !candidates.includes(a));
-    while(candidates.length < maxCandidates && candidates.length <= serversByPopulation.length) {
-        candidates.push(serversByPopulation[Math.max(0, candidates.length - 1)]);
+    for (let i = beforePopulation; i <= maxCandidates; i++) {
+        const idx = i - beforePopulation;
+        if (idx >= serversByPopulation.length) break;
+        candidates.push(serversByPopulation[idx]);
     }
 
     return candidates;

From aaeb6e49785fdbf5b2e823ddb7e319d9052f2c0e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 25 Oct 2018 15:59:42 -0600
Subject: [PATCH 095/218] Use about:blank instead

---
 src/components/views/elements/AppTile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 71cd65c89f..23b24adbb4 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -328,7 +328,7 @@ export default class AppTile extends React.Component {
                             // the iframe at a page that is reasonably safe to use in the
                             // event the iframe doesn't wink away.
                             // This is relative to where the Riot instance is located.
-                            this.refs.appFrame.src = '/config.json';
+                            this.refs.appFrame.src = 'about:blank';
                         }
 
                         WidgetUtils.setRoomWidget(

From 2bdff52937af2b66447256754d2e57b69b31b423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 26 Oct 2018 06:57:09 +0000
Subject: [PATCH 096/218] Translated using Weblate (French)

Currently translated at 100.0% (1272 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 125ac49b79..1a936270e6 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1294,5 +1294,9 @@
     "Clear cache and resync": "Vider le cache et resynchroniser",
     "Please accept all of the policies": "Veuillez accepter toutes les politiques",
     "Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d'accueil :",
-    "Add some now": "En ajouter maintenant"
+    "Add some now": "En ajouter maintenant",
+    "Joining room...": "Adhésion au salon…",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vous êtes administrateur de cette communauté. Vous ne pourrez pas revenir sans une invitation d'un autre administrateur.",
+    "Open Devtools": "Ouvrir les outils développeur",
+    "Show developer tools": "Afficher les outils de développeur"
 }

From ff1552c2f0b073e25cd6e1c9e44754b396c61acc Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkkx@protonmail.com>
Date: Thu, 25 Oct 2018 21:21:39 +0000
Subject: [PATCH 097/218] Translated using Weblate (Polish)

Currently translated at 93.3% (1188 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 148392117c..9c6f7fba5d 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1193,5 +1193,13 @@
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s dołączyli(-ły) %(count)s razy",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s dołączył(a) %(count)s razy",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s dołączył(a)",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s wyszli(-ły)"
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s wyszli(-ły)",
+    "Internal room ID: ": "Wewnętrzny identyfikator pokoju ",
+    "were invited %(count)s times|one": "zostali(-ły) zaproszeni(-one)",
+    "Show developer tools": "Pokaż narzędzia deweloperskie",
+    "An email address is required to register on this homeserver.": "Adres e-mail jest wymagany do rejestracji na tym serwerze domowym.",
+    "A phone number is required to register on this homeserver.": "Numer telefonu jest wymagany do rejestracji na tym serwerze domowym.",
+    "Updating Riot": "Aktualizowanie Riot",
+    "Submit Debug Logs": "Wyślij dzienniki błędów",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji."
 }

From 2dc335798d0fcfb0212a24e46ed40aa16ad2b3c9 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 26 Oct 2018 14:15:16 +0200
Subject: [PATCH 098/218] Repair DevTools button padding by centralizing styles

This moves the padding styles for dialog content to the .mx_Dialog rule. In
addition, it fixes vector-im/riot-web#7548 where the DevTools buttons had double
padding.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
---
 res/css/_common.scss                            | 6 ++----
 res/css/views/dialogs/_DevtoolsDialog.scss      | 4 ----
 res/css/views/dialogs/_ShareDialog.scss         | 5 -----
 res/css/views/dialogs/_UnknownDeviceDialog.scss | 5 +----
 src/components/views/dialogs/DevtoolsDialog.js  | 4 ++--
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index bf67edc1c3..9123e5ba8d 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -170,8 +170,7 @@ textarea {
     font-weight: 300;
     font-size: 15px;
     position: relative;
-    padding-left: 58px;
-    padding-bottom: 36px;
+    padding: 0 58px 36px;
     width: 60%;
     max-width: 704px;
     box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
@@ -216,14 +215,13 @@ textarea {
 }
 
 .mx_Dialog_content {
-    margin: 24px 58px 68px 0;
+    margin: 24px 0 68px;
     font-size: 14px;
     color: $primary-fg-color;
     word-wrap: break-word;
 }
 
 .mx_Dialog_buttons {
-    padding-right: 58px;
     text-align: right;
 }
 
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 3764bb13b3..a4a868bd11 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_DevTools_dialog {
-    padding-right: 58px;
-}
-
 .mx_DevTools_content {
     margin: 10px 0;
 }
diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index 116bef8dfd..9a2f67dea3 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -14,11 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ShareDialog {
-    // this is to center the content
-    padding-right: 58px;
-}
-
 .mx_ShareDialog hr {
     margin-top: 25px;
     margin-bottom: 25px;
diff --git a/res/css/views/dialogs/_UnknownDeviceDialog.scss b/res/css/views/dialogs/_UnknownDeviceDialog.scss
index 3457e50b92..e3801e3550 100644
--- a/res/css/views/dialogs/_UnknownDeviceDialog.scss
+++ b/res/css/views/dialogs/_UnknownDeviceDialog.scss
@@ -20,9 +20,6 @@ limitations under the License.
     // is a pain in the ass. plus might as well make the dialog big given how
     // important it is.
     height: 100%;
-
-    // position the gemini scrollbar nicely
-    padding-right: 58px;
 }
 
 .mx_UnknownDeviceDialog {
@@ -51,4 +48,4 @@ limitations under the License.
 .mx_UnknownDeviceDialog .mx_UnknownDeviceDialog_deviceList li {
     height: 40px;
     border-bottom: 1px solid $primary-hairline-color;
-}
\ No newline at end of file
+}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 22ee44f81a..ea198461c5 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -625,7 +625,7 @@ export default class DevtoolsDialog extends React.Component {
         let body;
 
         if (this.state.mode) {
-            body = <div className="mx_DevTools_dialog">
+            body = <div>
                 <div className="mx_DevTools_label_left">{ this.state.mode.getLabel() }</div>
                 <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
                 <div className="mx_DevTools_label_bottom" />
@@ -634,7 +634,7 @@ export default class DevtoolsDialog extends React.Component {
         } else {
             const classes = "mx_DevTools_RoomStateExplorer_button";
             body = <div>
-                <div className="mx_DevTools_dialog">
+                <div>
                     <div className="mx_DevTools_label_left">{ _t('Toolbox') }</div>
                     <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
                     <div className="mx_DevTools_label_bottom" />

From 156ffd1334fd465ded3c99dbd643264e47a9557d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 Oct 2018 17:01:44 +0100
Subject: [PATCH 099/218] Fix autoreplacement of ascii emoji

More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
---
 src/components/views/rooms/MessageComposerInput.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 570cb8a59b..6f56d35105 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -544,7 +544,7 @@ export default class MessageComposerInput extends React.Component {
 
         if (editorState.startText !== null) {
             const text = editorState.startText.text;
-            const currentStartOffset = editorState.startOffset;
+            const currentStartOffset = editorState.selection.start.offset;
 
             // Automatic replacement of plaintext emoji to Unicode emoji
             if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
@@ -558,11 +558,11 @@ export default class MessageComposerInput extends React.Component {
 
                     const range = Range.create({
                         anchor: {
-                            key: editorState.selection.startKey,
+                            key: editorState.startText.key,
                             offset: currentStartOffset - emojiMatch[1].length - 1,
                         },
                         focus: {
-                            key: editorState.selection.startKey,
+                            key: editorState.startText.key,
                             offset: currentStartOffset - 1,
                         },
                     });

From ef8c9246aaef1bd1308fc58974c1a70758a8d82f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 10:07:21 -0600
Subject: [PATCH 100/218] Maybe fix UserSettings?

---
 src/components/structures/UserSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index f32026511b..772eb70dde 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -1298,7 +1298,7 @@ module.exports = React.createClass({
         // If the olmVersion is not defined then either crypto is disabled, or
         // we are using a version old version of olm. We assume the former.
         let olmVersionString = "<not-enabled>";
-        if (olmVersion !== undefined) {
+        if (olmVersion) {
             olmVersionString = `${olmVersion[0]}.${olmVersion[1]}.${olmVersion[2]}`;
         }
 

From c389540522067978298eaf487596ee0fd30948a2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 10:22:18 -0600
Subject: [PATCH 101/218] Appease the linter

---
 src/matrix-to.js       |  6 ++---
 test/matrix-to-test.js | 56 +++++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/matrix-to.js b/src/matrix-to.js
index 881972410f..e513cbb14c 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -39,7 +39,7 @@ export function makeGroupPermalink(groupId) {
 
 export function encodeServerCandidates(candidates) {
     if (!candidates) return '';
-    return `via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`
+    return `via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`;
 }
 
 export function pickServerCandidates(roomId) {
@@ -85,7 +85,7 @@ export function pickServerCandidates(roomId) {
     // the list and magically have the link work.
 
     const populationMap: {[server:string]:number} = {};
-    const highestPlUser = {userId:null, powerLevel: 0, serverName: null};
+    const highestPlUser = {userId: null, powerLevel: 0, serverName: null};
 
     for (const member of room.getJoinedMembers()) {
         const serverName = member.userId.split(":").splice(1).join(":");
@@ -114,4 +114,4 @@ export function pickServerCandidates(roomId) {
     }
 
     return candidates;
-}
\ No newline at end of file
+}
diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
index dbe7fa55ff..d199588b9a 100644
--- a/test/matrix-to-test.js
+++ b/test/matrix-to-test.js
@@ -17,7 +17,7 @@ import {pickServerCandidates} from "../src/matrix-to";
 import * as testUtils from "./test-utils";
 
 
-describe('matrix-to', function () {
+describe('matrix-to', function() {
     let sandbox;
 
     beforeEach(function() {
@@ -30,25 +30,25 @@ describe('matrix-to', function () {
         sandbox.restore();
     });
 
-    it('should pick no candidate servers when the room is not found', function () {
+    it('should pick no candidate servers when the room is not found', function() {
         peg.get().getRoom = () => null;
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
         expect(pickedServers.length).toBe(0);
     });
 
-    it('should pick no candidate servers when the room has no members', function () {
+    it('should pick no candidate servers when the room has no members', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
         expect(pickedServers.length).toBe(0);
     });
 
-    it('should pick a candidate server for the highest power level user in the room', function () {
+    it('should pick a candidate server for the highest power level user in the room', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
@@ -63,9 +63,9 @@ describe('matrix-to', function () {
                     {
                         userId: "@alice:pl_95",
                         powerLevel: 95,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
@@ -74,7 +74,7 @@ describe('matrix-to', function () {
         // we don't check the 2nd and 3rd servers because that is done by the next test
     });
 
-    it('should pick candidate servers based on user population', function () {
+    it('should pick candidate servers based on user population', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
@@ -101,9 +101,9 @@ describe('matrix-to', function () {
                     {
                         userId: "@charlie:third",
                         powerLevel: 0,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
@@ -113,7 +113,7 @@ describe('matrix-to', function () {
         expect(pickedServers[2]).toBe("third");
     });
 
-    it('should pick prefer candidate servers with higher power levels', function () {
+    it('should pick prefer candidate servers with higher power levels', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
@@ -132,9 +132,9 @@ describe('matrix-to', function () {
                     {
                         userId: "@charlie:third",
                         powerLevel: 0,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
@@ -144,16 +144,16 @@ describe('matrix-to', function () {
         expect(pickedServers[2]).toBe("third");
     });
 
-    it('should work with IPv4 hostnames', function () {
+    it('should work with IPv4 hostnames', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {
                         userId: "@alice:127.0.0.1",
                         powerLevel: 100,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
@@ -161,16 +161,16 @@ describe('matrix-to', function () {
         expect(pickedServers[0]).toBe("127.0.0.1");
     });
 
-    it('should work with IPv6 hostnames', function () {
+    it('should work with IPv6 hostnames', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {
                         userId: "@alice:[::1]",
                         powerLevel: 100,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
@@ -178,16 +178,16 @@ describe('matrix-to', function () {
         expect(pickedServers[0]).toBe("[::1]");
     });
 
-    it('should work with IPv4 hostnames with ports', function () {
+    it('should work with IPv4 hostnames with ports', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {
                         userId: "@alice:127.0.0.1:8448",
                         powerLevel: 100,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
@@ -195,16 +195,16 @@ describe('matrix-to', function () {
         expect(pickedServers[0]).toBe("127.0.0.1:8448");
     });
 
-    it('should work with IPv6 hostnames with ports', function () {
+    it('should work with IPv6 hostnames with ports', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {
                         userId: "@alice:[::1]:8448",
                         powerLevel: 100,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();
@@ -212,16 +212,16 @@ describe('matrix-to', function () {
         expect(pickedServers[0]).toBe("[::1]:8448");
     });
 
-    it('should work with hostnames with ports', function () {
+    it('should work with hostnames with ports', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
                     {
                         userId: "@alice:example.org:8448",
                         powerLevel: 100,
-                    }
+                    },
                 ],
-            }
+            };
         };
         const pickedServers = pickServerCandidates("!somewhere:example.org");
         expect(pickedServers).toExist();

From d802ee0fa2ce0a68986f848b9924ac352ededf54 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 10:25:23 -0600
Subject: [PATCH 102/218] Move the max candidates constant out of the function

---
 src/matrix-to.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/matrix-to.js b/src/matrix-to.js
index e513cbb14c..adcbdf8111 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -19,6 +19,10 @@ import MatrixClientPeg from "./MatrixClientPeg";
 export const host = "matrix.to";
 export const baseUrl = `https://${host}`;
 
+// The maximum number of servers to pick when working out which servers
+// to add to permalinks. The servers are appended as ?via=example.org
+const MAX_SERVER_CANDIDATES = 3;
+
 export function makeEventPermalink(roomId, eventId) {
     const serverCandidates = pickServerCandidates(roomId);
     return `${baseUrl}/#/${roomId}/${eventId}?${encodeServerCandidates(serverCandidates)}`;
@@ -103,11 +107,10 @@ export function pickServerCandidates(roomId) {
     if (highestPlUser.powerLevel >= 50) candidates.push(highestPlUser.serverName);
 
     const beforePopulation = candidates.length;
-    const maxCandidates = 3;
     const serversByPopulation = Object.keys(populationMap)
         .sort((a, b) => populationMap[b] - populationMap[a])
         .filter(a => !candidates.includes(a));
-    for (let i = beforePopulation; i <= maxCandidates; i++) {
+    for (let i = beforePopulation; i <= MAX_SERVER_CANDIDATES; i++) {
         const idx = i - beforePopulation;
         if (idx >= serversByPopulation.length) break;
         candidates.push(serversByPopulation[idx]);

From de366fa0e8318991e97476c34e9449a1590feb71 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 Oct 2018 17:55:59 +0100
Subject: [PATCH 103/218] Add cancel button to error stage

---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 4bb1f31558..e561fe033c 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -181,12 +181,15 @@ export default React.createClass({
 
         let content;
         if (this.state.error) {
+            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             content = <div>
                 <p>{_t("Unable to create key backup")}</p>
                 <div className="mx_Dialog_buttons">
-                    <button onClick={this._createBackup}>
-                        {_t("Retry")}
-                    </button>
+                    <DialogButtons primaryButton={_t('Retry')}
+                        onPrimaryButtonClick={this._createBackup}
+                        hasCancel={true}
+                        onCancel={this._onCancel}
+                    />
                 </div>
             </div>;
         } else {

From 3734c8ab9169d861b9935d254b13838dfc9f3f4a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 12:21:02 -0600
Subject: [PATCH 104/218] Don't mention that matrix.org is likely to be popular

This is untrue for quite a few real scenarios, including private federations and a ton of rooms.
---
 src/matrix-to.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/matrix-to.js b/src/matrix-to.js
index adcbdf8111..62ad7c3e6f 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -68,10 +68,8 @@ export function pickServerCandidates(roomId) {
     //   room.
     //
     //   Server 2: The next most popular server in the room (in user
-    //   distribution). This will probably be matrix.org in most cases
-    //   although it is certainly possible to be some other server. This
-    //   cannot be the same as Server 1. If no other servers are available
-    //   then we'll only return Server 1.
+    //   distribution). This cannot be the same as Server 1. If no other
+    //   servers are available then we'll only return Server 1.
     //
     //   Server 3: The next most popular server by user distribution. This
     //   has the same rules as Server 2, with the added exception that it

From 0857e2c5e9f88657b4f792507233721613fc51d5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 12:21:27 -0600
Subject: [PATCH 105/218] Clarify why we pick popular servers over the one that
 created the room

---
 src/matrix-to.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/matrix-to.js b/src/matrix-to.js
index 62ad7c3e6f..944446c4cc 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -80,6 +80,12 @@ export function pickServerCandidates(roomId) {
     // be ACL'd in the future or for some reason be evicted from the room
     // however an event like that is unlikely the larger the room gets.
 
+    // Note: we don't pick the server the room was created on because the
+    // homeserver should already be using that server as a last ditch attempt
+    // and there's less of a guarantee that the server is a resident server.
+    // Instead, we actively figure out which servers are likely to be residents
+    // in the future and try to use those.
+
     // Note: Users receiving permalinks that happen to have all 3 potential
     // servers fail them (in terms of joining) are somewhat expected to hunt
     // down the person who gave them the link to ask for a participating server.

From 3bc5e2beb3f57cce1170e2e9813bf9fe92a85d92 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 19:47:53 -0600
Subject: [PATCH 106/218] Fix and test matrix.to alias permalinks

Fixes https://github.com/vector-im/riot-web/issues/7614
Regression of https://github.com/matrix-org/matrix-react-sdk/pull/2250
---
 src/matrix-to.js       |  17 ++++--
 test/matrix-to-test.js | 120 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 133 insertions(+), 4 deletions(-)

diff --git a/src/matrix-to.js b/src/matrix-to.js
index 944446c4cc..c0b57e725d 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -24,8 +24,13 @@ export const baseUrl = `https://${host}`;
 const MAX_SERVER_CANDIDATES = 3;
 
 export function makeEventPermalink(roomId, eventId) {
+    const permalinkBase = `${baseUrl}/#/${roomId}/${eventId}`;
+
+    // If the roomId isn't actually a room ID, don't try to list the servers.
+    // Aliases are already routable, and don't need extra information.
+    if (roomId[0] !== '!') return permalinkBase;
     const serverCandidates = pickServerCandidates(roomId);
-    return `${baseUrl}/#/${roomId}/${eventId}?${encodeServerCandidates(serverCandidates)}`;
+    return `${permalinkBase}${encodeServerCandidates(serverCandidates)}`;
 }
 
 export function makeUserPermalink(userId) {
@@ -33,8 +38,14 @@ export function makeUserPermalink(userId) {
 }
 
 export function makeRoomPermalink(roomId) {
+    const permalinkBase = `${baseUrl}/#/${roomId}`;
+
+    // If the roomId isn't actually a room ID, don't try to list the servers.
+    // Aliases are already routable, and don't need extra information.
+    if (roomId[0] !== '!') return permalinkBase;
+
     const serverCandidates = pickServerCandidates(roomId);
-    return `${baseUrl}/#/${roomId}?${encodeServerCandidates(serverCandidates)}`;
+    return `${permalinkBase}${encodeServerCandidates(serverCandidates)}`;
 }
 
 export function makeGroupPermalink(groupId) {
@@ -43,7 +54,7 @@ export function makeGroupPermalink(groupId) {
 
 export function encodeServerCandidates(candidates) {
     if (!candidates) return '';
-    return `via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`;
+    return `?via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`;
 }
 
 export function pickServerCandidates(roomId) {
diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
index d199588b9a..c581880158 100644
--- a/test/matrix-to-test.js
+++ b/test/matrix-to-test.js
@@ -13,7 +13,13 @@ limitations under the License.
 
 import expect from 'expect';
 import peg from '../src/MatrixClientPeg';
-import {pickServerCandidates} from "../src/matrix-to";
+import {
+    makeEventPermalink,
+    makeGroupPermalink,
+    makeRoomPermalink,
+    makeUserPermalink,
+    pickServerCandidates
+} from "../src/matrix-to";
 import * as testUtils from "./test-utils";
 
 
@@ -228,4 +234,116 @@ describe('matrix-to', function() {
         expect(pickedServers.length).toBe(1);
         expect(pickedServers[0]).toBe("example.org:8448");
     });
+
+    it('should generate an event permalink for room IDs with no candidate servers', function() {
+        peg.get().getRoom = () => null;
+        const result = makeEventPermalink("!somewhere:example.org", "$something:example.com");
+        expect(result).toBe("https://matrix.to/#/!somewhere:example.org/$something:example.com");
+    });
+
+    it('should generate an event permalink for room IDs with some candidate servers', function() {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:first",
+                        powerLevel: 100,
+                    },
+                    {
+                        userId: "@bob:second",
+                        powerLevel: 0,
+                    },
+                ],
+            };
+        };
+        const result = makeEventPermalink("!somewhere:example.org", "$something:example.com");
+        expect(result).toBe("https://matrix.to/#/!somewhere:example.org/$something:example.com?via=first&via=second");
+    });
+
+    it('should generate a room permalink for room IDs with no candidate servers', function() {
+        peg.get().getRoom = () => null;
+        const result = makeRoomPermalink("!somewhere:example.org");
+        expect(result).toBe("https://matrix.to/#/!somewhere:example.org");
+    });
+
+    it('should generate a room permalink for room IDs with some candidate servers', function() {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:first",
+                        powerLevel: 100,
+                    },
+                    {
+                        userId: "@bob:second",
+                        powerLevel: 0,
+                    },
+                ],
+            };
+        };
+        const result = makeRoomPermalink("!somewhere:example.org");
+        expect(result).toBe("https://matrix.to/#/!somewhere:example.org?via=first&via=second");
+    });
+
+    // Technically disallowed but we'll test it anyways
+    it('should generate an event permalink for room aliases with no candidate servers', function() {
+        peg.get().getRoom = () => null;
+        const result = makeEventPermalink("#somewhere:example.org", "$something:example.com");
+        expect(result).toBe("https://matrix.to/#/#somewhere:example.org/$something:example.com");
+    });
+
+    // Technically disallowed but we'll test it anyways
+    it('should generate an event permalink for room aliases without candidate servers even when some are available', function() {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:first",
+                        powerLevel: 100,
+                    },
+                    {
+                        userId: "@bob:second",
+                        powerLevel: 0,
+                    },
+                ],
+            };
+        };
+        const result = makeEventPermalink("#somewhere:example.org", "$something:example.com");
+        expect(result).toBe("https://matrix.to/#/#somewhere:example.org/$something:example.com");
+    });
+
+    it('should generate a room permalink for room aliases with no candidate servers', function() {
+        peg.get().getRoom = () => null;
+        const result = makeRoomPermalink("#somewhere:example.org");
+        expect(result).toBe("https://matrix.to/#/#somewhere:example.org");
+    });
+
+    it('should generate a room permalink for room aliases without candidate servers even when some are available', function() {
+        peg.get().getRoom = () => {
+            return {
+                getJoinedMembers: () => [
+                    {
+                        userId: "@alice:first",
+                        powerLevel: 100,
+                    },
+                    {
+                        userId: "@bob:second",
+                        powerLevel: 0,
+                    },
+                ],
+            };
+        };
+        const result = makeRoomPermalink("#somewhere:example.org");
+        expect(result).toBe("https://matrix.to/#/#somewhere:example.org");
+    });
+
+    it('should generate a user permalink', function() {
+        const result = makeUserPermalink("@someone:example.org");
+        expect(result).toBe("https://matrix.to/#/@someone:example.org");
+    });
+
+    it('should generate a group permalink', function() {
+        const result = makeGroupPermalink("+community:example.org");
+        expect(result).toBe("https://matrix.to/#/+community:example.org");
+    });
 });

From 5b22d157a7871440b4fcc593313aada12b852faa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 20:34:06 -0600
Subject: [PATCH 107/218] Fix candidate server encoding

---
 src/matrix-to.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/matrix-to.js b/src/matrix-to.js
index c0b57e725d..b5827f671a 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -29,6 +29,7 @@ export function makeEventPermalink(roomId, eventId) {
     // If the roomId isn't actually a room ID, don't try to list the servers.
     // Aliases are already routable, and don't need extra information.
     if (roomId[0] !== '!') return permalinkBase;
+
     const serverCandidates = pickServerCandidates(roomId);
     return `${permalinkBase}${encodeServerCandidates(serverCandidates)}`;
 }
@@ -53,7 +54,7 @@ export function makeGroupPermalink(groupId) {
 }
 
 export function encodeServerCandidates(candidates) {
-    if (!candidates) return '';
+    if (!candidates || candidates.length === 0) return '';
     return `?via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`;
 }
 

From 0cdc44a2054e424fa17b7e01e1c545736c145d89 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Oct 2018 20:49:01 -0600
Subject: [PATCH 108/218] Appease the linter

---
 test/matrix-to-test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
index c581880158..70533575c4 100644
--- a/test/matrix-to-test.js
+++ b/test/matrix-to-test.js
@@ -18,7 +18,7 @@ import {
     makeGroupPermalink,
     makeRoomPermalink,
     makeUserPermalink,
-    pickServerCandidates
+    pickServerCandidates,
 } from "../src/matrix-to";
 import * as testUtils from "./test-utils";
 
@@ -293,7 +293,7 @@ describe('matrix-to', function() {
     });
 
     // Technically disallowed but we'll test it anyways
-    it('should generate an event permalink for room aliases without candidate servers even when some are available', function() {
+    it('should generate an event permalink for room aliases without candidate servers', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [
@@ -318,7 +318,7 @@ describe('matrix-to', function() {
         expect(result).toBe("https://matrix.to/#/#somewhere:example.org");
     });
 
-    it('should generate a room permalink for room aliases without candidate servers even when some are available', function() {
+    it('should generate a room permalink for room aliases without candidate servers', function() {
         peg.get().getRoom = () => {
             return {
                 getJoinedMembers: () => [

From 790ecbcbb09e28376301b5085e72392d8e040356 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 26 Oct 2018 22:07:10 -0500
Subject: [PATCH 109/218] Update babel-eslint to 8.1.1

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 03311a50e3..7934cc2bcb 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^8.1.1",
     "babel-loader": "^7.1.5",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-async-to-bluebird": "^1.1.1",

From 952bdba9791c4c7bd5680c845104dc4f7f2fb96f Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 26 Oct 2018 22:48:11 -0500
Subject: [PATCH 110/218] Update more eslint related packages

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 7934cc2bcb..8cd612f84b 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
-    "babel-eslint": "^8.1.1",
+    "babel-eslint": "^10.0.1",
     "babel-loader": "^7.1.5",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-async-to-bluebird": "^1.1.1",
@@ -115,9 +115,9 @@
     "babel-preset-react": "^6.24.1",
     "chokidar": "^1.6.1",
     "concurrently": "^4.0.1",
-    "eslint": "^3.13.1",
+    "eslint": "^5.8.0",
     "eslint-config-google": "^0.7.1",
-    "eslint-plugin-babel": "^4.1.2",
+    "eslint-plugin-babel": "^5.2.1",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-react": "^7.7.0",
     "estree-walker": "^0.5.0",

From 49ce4ef117b854eff3ab26ae30a1b336a250532d Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 26 Oct 2018 22:50:35 -0500
Subject: [PATCH 111/218] eslint --fix src/

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 .eslintignore.errorfiles                      | 10 ---
 src/ComposerHistoryManager.js                 |  1 -
 src/Entities.js                               |  1 -
 src/HtmlUtils.js                              |  2 +-
 src/PasswordReset.js                          |  1 -
 src/Presence.js                               |  1 -
 src/Rooms.js                                  |  3 +-
 src/ScalarAuthClient.js                       |  1 -
 src/SdkConfig.js                              |  1 -
 src/UserActivity.js                           |  1 -
 src/UserSettingsStore.js                      |  2 +-
 src/VelocityBounce.js                         |  6 +-
 src/autocomplete/Autocompleter.js             |  2 +-
 src/autocomplete/CommunityProvider.js         |  2 +-
 src/autocomplete/PlainWithPillsSerializer.js  |  1 -
 src/components/structures/BottomLeftMenu.js   | 12 +--
 .../structures/CompatibilityPage.js           |  9 +-
 src/components/structures/CreateRoom.js       |  8 +-
 src/components/structures/GroupView.js        |  2 +-
 src/components/structures/HomePage.js         | 14 ++-
 src/components/structures/LeftPanel.js        |  6 +-
 src/components/structures/LoggedInView.js     |  6 +-
 src/components/structures/LoginBox.js         |  2 +-
 src/components/structures/RoomDirectory.js    | 86 +++++++++----------
 src/components/structures/RoomStatusBar.js    |  4 +-
 src/components/structures/RoomView.js         |  6 +-
 src/components/structures/SearchBox.js        | 30 +++----
 src/components/structures/TimelinePanel.js    |  2 +-
 src/components/structures/UserSettings.js     |  2 +-
 src/components/structures/ViewSource.js       |  2 +-
 src/components/views/avatars/MemberAvatar.js  |  2 +-
 .../GroupInviteTileContextMenu.js             |  2 +-
 .../views/dialogs/ChangelogDialog.js          | 10 +--
 .../views/dialogs/ChatCreateOrReuseDialog.js  |  1 -
 .../views/directory/NetworkDropdown.js        | 10 +--
 .../views/elements/DeviceVerifyButtons.js     |  2 +-
 .../views/elements/EditableTextContainer.js   |  1 -
 src/components/views/elements/ImageView.js    | 52 ++++++-----
 .../views/elements/InlineSpinner.js           | 10 +--
 .../views/elements/PersistedElement.js        |  1 -
 src/components/views/elements/Spinner.js      | 12 +--
 .../views/elements/TintableSvgButton.js       |  1 -
 src/components/views/globals/MatrixToolbar.js |  2 +-
 src/components/views/globals/NewVersionBar.js | 10 +--
 .../views/globals/UpdateCheckBar.js           | 10 +--
 .../login/InteractiveAuthEntryComponents.js   |  4 +-
 .../views/room_settings/AliasSettings.js      |  4 +-
 src/components/views/rooms/Autocomplete.js    |  1 -
 .../views/rooms/LinkPreviewWidget.js          |  2 +-
 src/components/views/rooms/MemberInfo.js      |  2 +-
 src/components/views/rooms/MessageComposer.js |  4 +-
 .../views/rooms/MessageComposerInput.js       | 16 ++--
 src/components/views/rooms/RoomPreviewBar.js  |  2 +-
 src/components/views/rooms/RoomSettings.js    | 14 +--
 .../views/settings/Notifications.js           | 14 +--
 src/notifications/StandardActions.js          |  4 +-
 src/settings/SettingsStore.js                 |  2 +-
 src/settings/controllers/SettingController.js |  1 -
 src/stores/RoomListStore.js                   |  1 -
 src/utils/DMRoomMap.js                        |  2 +-
 src/utils/DecryptFile.js                      |  2 +-
 61 files changed, 197 insertions(+), 230 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 8d0821207a..0b4266c0b5 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -7,11 +7,8 @@ src/component-index.js
 src/components/structures/BottomLeftMenu.js
 src/components/structures/CompatibilityPage.js
 src/components/structures/CreateRoom.js
-src/components/structures/HomePage.js
-src/components/structures/LeftPanel.js
 src/components/structures/LoggedInView.js
 src/components/structures/login/ForgotPassword.js
-src/components/structures/LoginBox.js
 src/components/structures/MessagePanel.js
 src/components/structures/NotificationPanel.js
 src/components/structures/RoomDirectory.js
@@ -22,22 +19,17 @@ src/components/structures/SearchBox.js
 src/components/structures/TimelinePanel.js
 src/components/structures/UploadBar.js
 src/components/structures/UserSettings.js
-src/components/structures/ViewSource.js
 src/components/views/avatars/BaseAvatar.js
 src/components/views/avatars/MemberAvatar.js
 src/components/views/create_room/RoomAlias.js
-src/components/views/dialogs/ChangelogDialog.js
 src/components/views/dialogs/DeactivateAccountDialog.js
 src/components/views/dialogs/SetPasswordDialog.js
 src/components/views/dialogs/UnknownDeviceDialog.js
 src/components/views/directory/NetworkDropdown.js
 src/components/views/elements/AddressSelector.js
-src/components/views/elements/DeviceVerifyButtons.js
 src/components/views/elements/DirectorySearchBox.js
 src/components/views/elements/ImageView.js
-src/components/views/elements/InlineSpinner.js
 src/components/views/elements/MemberEventListSummary.js
-src/components/views/elements/Spinner.js
 src/components/views/elements/TintableSvg.js
 src/components/views/elements/UserSelector.js
 src/components/views/globals/MatrixToolbar.js
@@ -90,7 +82,6 @@ src/MatrixClientPeg.js
 src/Modal.js
 src/notifications/ContentRules.js
 src/notifications/PushRuleVectorState.js
-src/notifications/StandardActions.js
 src/notifications/VectorPushRulesDefinitions.js
 src/Notifier.js
 src/PlatformPeg.js
@@ -111,7 +102,6 @@ src/utils/MultiInviter.js
 src/utils/Receipt.js
 src/VectorConferenceHandler.js
 src/Velociraptor.js
-src/VelocityBounce.js
 src/WhoIsTyping.js
 src/wrappers/withMatrixClient.js
 test/components/structures/login/Registration-test.js
diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 0164e6c4cd..ecf773f2e7 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -22,7 +22,6 @@ import _clamp from 'lodash/clamp';
 type MessageFormat = 'rich' | 'markdown';
 
 class HistoryItem {
-
     // We store history items in their native format to ensure history is accurate
     // and then convert them if our RTE has subsequently changed format.
     value: Value;
diff --git a/src/Entities.js b/src/Entities.js
index 21abd9c473..8be1da0db8 100644
--- a/src/Entities.js
+++ b/src/Entities.js
@@ -78,7 +78,6 @@ class MemberEntity extends Entity {
 }
 
 class UserEntity extends Entity {
-
     constructor(model, showInviteButton, inviteFn) {
         super(model);
         this.showInviteButton = Boolean(showInviteButton);
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index b6a2bd0acb..e72c0bfe4b 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -64,7 +64,7 @@ export function containsEmoji(str) {
  * because we want to include emoji shortnames in title text
  */
 function unicodeToImage(str) {
-    let replaceWith, unicode, alt, short, fname;
+    let replaceWith; let unicode; let alt; let short; let fname;
     const mappedUnicode = emojione.mapUnicodeToShort();
 
     str = str.replace(emojione.regUnicode, function(unicodeChar) {
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index 71fc4f6b31..df51e4d846 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -25,7 +25,6 @@ import { _t } from './languageHandler';
  * API on the homeserver in question with the new password.
  */
 class PasswordReset {
-
     /**
      * Configure the endpoints for password resetting.
      * @param {string} homeserverUrl The URL to the HS which has the account to reset.
diff --git a/src/Presence.js b/src/Presence.js
index 9367fe35cd..b1e85e4bc7 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -23,7 +23,6 @@ const UNAVAILABLE_TIME_MS = 3 * 60 * 1000; // 3 mins
 const PRESENCE_STATES = ["online", "offline", "unavailable"];
 
 class Presence {
-
     /**
      * Start listening the user activity to evaluate his presence state.
      * Any state change will be sent to the Home Server.
diff --git a/src/Rooms.js b/src/Rooms.js
index e24b8316b3..6f73ea0659 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -32,7 +32,6 @@ export function getDisplayAliasForRoom(room) {
  * return the other one. Otherwise, return null.
  */
 export function getOnlyOtherMember(room, myUserId) {
-
     if (room.currentState.getJoinedMemberCount() === 2) {
         return room.getJoinedMembers().filter(function(m) {
             return m.userId !== myUserId;
@@ -103,7 +102,7 @@ export function guessAndSetDMRoom(room, isDirect) {
     let newTarget;
     if (isDirect) {
         const guessedUserId = guessDMRoomTargetId(
-            room, MatrixClientPeg.get().getUserId()
+            room, MatrixClientPeg.get().getUserId(),
         );
         newTarget = guessedUserId;
     } else {
diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 2038430576..0639e7ceae 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -22,7 +22,6 @@ const SdkConfig = require('./SdkConfig');
 const MatrixClientPeg = require('./MatrixClientPeg');
 
 class ScalarAuthClient {
-
     constructor() {
         this.scalarToken = null;
     }
diff --git a/src/SdkConfig.js b/src/SdkConfig.js
index 8df725a913..65982bd6f2 100644
--- a/src/SdkConfig.js
+++ b/src/SdkConfig.js
@@ -24,7 +24,6 @@ const DEFAULTS = {
 };
 
 class SdkConfig {
-
     static get() {
         return global.mxReactSdkConfig || {};
     }
diff --git a/src/UserActivity.js b/src/UserActivity.js
index b6fae38ed5..c628ab4186 100644
--- a/src/UserActivity.js
+++ b/src/UserActivity.js
@@ -25,7 +25,6 @@ const CURRENTLY_ACTIVE_THRESHOLD_MS = 2000;
  * with the app (but at a much lower frequency than mouse move events)
  */
 class UserActivity {
-
     /**
      * Start listening to user activity
      */
diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 5d2af3715f..b40d0529a2 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -87,7 +87,7 @@ export default {
             device_display_name: address,
             lang: navigator.language,
             data: data,
-            append: true,  // We always append for email pushers since we don't want to stop other accounts notifying to the same email address
+            append: true, // We always append for email pushers since we don't want to stop other accounts notifying to the same email address
         });
     },
 };
diff --git a/src/VelocityBounce.js b/src/VelocityBounce.js
index 2141b05325..732550cfcb 100644
--- a/src/VelocityBounce.js
+++ b/src/VelocityBounce.js
@@ -3,8 +3,10 @@ const Velocity = require('velocity-vector');
 // courtesy of https://github.com/julianshapiro/velocity/issues/283
 // We only use easeOutBounce (easeInBounce is just sort of nonsensical)
 function bounce( p ) {
-    let pow2,
-        bounce = 4;
+    let pow2;
+
+
+let bounce = 4;
 
     while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {
         // just sets pow2
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 7f91676cc3..e7b89fe576 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -85,7 +85,7 @@ export default class Autocompleter {
                 provider
                     .getCompletions(query, selection, force)
                     .timeout(PROVIDER_COMPLETION_TIMEOUT)
-                    .reflect()
+                    .reflect(),
             ),
         );
 
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
index d164fab46a..b85c09b320 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.js
@@ -61,7 +61,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         if (command) {
             const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership === 'join');
 
-            const groups = (await Promise.all(joinedGroups.map(async ({groupId}) => {
+            const groups = (await Promise.all(joinedGroups.map(async({groupId}) => {
                 try {
                     return FlairStore.getGroupProfileCached(cli, groupId);
                 } catch (e) { // if FlairStore failed, fall back to just groupId
diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
index 59cf1bde3b..09bb3772ac 100644
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ b/src/autocomplete/PlainWithPillsSerializer.js
@@ -26,7 +26,6 @@ import { Block } from 'slate';
  */
 
 class PlainWithPillsSerializer {
-
     /*
      * @param {String} options.pillFormat - either 'md', 'plain', 'id'
      */
diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index d289ca5da1..ed8b8a00b7 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -33,12 +33,12 @@ module.exports = React.createClass({
     },
 
     getInitialState: function() {
-        return({
-            directoryHover : false,
-            roomsHover : false,
+        return ({
+            directoryHover: false,
+            roomsHover: false,
             homeHover: false,
-            peopleHover : false,
-            settingsHover : false,
+            peopleHover: false,
+            settingsHover: false,
         });
     },
 
@@ -145,7 +145,7 @@ module.exports = React.createClass({
     // Get the label/tooltip to show
     getLabel: function(label, show) {
         if (show) {
-            var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
             return <RoomTooltip className="mx_BottomLeftMenu_tooltip" label={label} />;
         }
     },
diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
index 4cbaab3dfa..3c5005c053 100644
--- a/src/components/structures/CompatibilityPage.js
+++ b/src/components/structures/CompatibilityPage.js
@@ -16,18 +16,18 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 import { _t } from '../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'CompatibilityPage',
     propTypes: {
-        onAccept: React.PropTypes.func
+        onAccept: React.PropTypes.func,
     },
 
     getDefaultProps: function() {
         return {
-            onAccept: function() {} // NOP
+            onAccept: function() {}, // NOP
         };
     },
 
@@ -36,7 +36,6 @@ module.exports = React.createClass({
     },
 
     render: function() {
-
         return (
         <div className="mx_CompatibilityPage">
             <div className="mx_CompatibilityPage_box">
@@ -69,5 +68,5 @@ module.exports = React.createClass({
             </div>
         </div>
         );
-    }
+    },
 });
diff --git a/src/components/structures/CreateRoom.js b/src/components/structures/CreateRoom.js
index 2bb9adb544..a8aac71479 100644
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@@ -36,10 +36,10 @@ module.exports = React.createClass({
     },
 
     phases: {
-        CONFIG: "CONFIG",  // We're waiting for user to configure and hit create.
-        CREATING: "CREATING",  // We're sending the request.
-        CREATED: "CREATED",  // We successfully created the room.
-        ERROR: "ERROR",  // There was an error while trying to create room.
+        CONFIG: "CONFIG", // We're waiting for user to configure and hit create.
+        CREATING: "CREATING", // We're sending the request.
+        CREATED: "CREATED", // We successfully created the room.
+        ERROR: "ERROR", // There was an error while trying to create room.
     },
 
     getDefaultProps: function() {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 5d23194702..2c287c1b60 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -777,7 +777,7 @@ export default React.createClass({
             ),
             button: _t("Leave"),
             danger: this.state.isUserPrivileged,
-            onFinished: async (confirmed) => {
+            onFinished: async(confirmed) => {
                 if (!confirmed) return;
 
                 this.setState({membershipBusy: true});
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index 457796f5dc..89053b35c7 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -52,15 +52,14 @@ class HomePage extends React.Component {
 
         if (this.props.teamToken && this.props.teamServerUrl) {
             this.setState({
-                iframeSrc: `${this.props.teamServerUrl}/static/${this.props.teamToken}/home.html`
+                iframeSrc: `${this.props.teamServerUrl}/static/${this.props.teamToken}/home.html`,
             });
-        }
-        else {
+        } else {
             // we use request() to inline the homepage into the react component
             // so that it can inherit CSS and theming easily rather than mess around
             // with iframes and trying to synchronise document.stylesheets.
 
-            let src = this.props.homePageUrl || 'home.html';
+            const src = this.props.homePageUrl || 'home.html';
 
             request(
                 { method: "GET", url: src },
@@ -77,7 +76,7 @@ class HomePage extends React.Component {
 
                     body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1)=>this.translate(g1));
                     this.setState({ page: body });
-                }
+                },
             );
         }
     }
@@ -93,8 +92,7 @@ class HomePage extends React.Component {
                     <iframe src={ this.state.iframeSrc } />
                 </div>
             );
-        }
-        else {
+        } else {
             const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
             return (
                 <GeminiScrollbarWrapper autoshow={true} className="mx_HomePage">
@@ -106,4 +104,4 @@ class HomePage extends React.Component {
     }
 }
 
-module.exports = HomePage;
\ No newline at end of file
+module.exports = HomePage;
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 72d640bcac..2d6e7b66d2 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -28,7 +28,7 @@ import VectorConferenceHandler from '../../VectorConferenceHandler';
 import SettingsStore from '../../settings/SettingsStore';
 
 
-var LeftPanel = React.createClass({
+const LeftPanel = React.createClass({
     displayName: 'LeftPanel',
 
     // NB. If you add props, don't forget to update
@@ -214,11 +214,11 @@ var LeftPanel = React.createClass({
                         collapsed={this.props.collapsed}
                         searchFilter={this.state.searchFilter}
                         ConferenceHandler={VectorConferenceHandler} />
-                    <BottomLeftMenu collapsed={this.props.collapsed}/>
+                    <BottomLeftMenu collapsed={this.props.collapsed} />
                 </aside>
             </div>
         );
-    }
+    },
 });
 
 module.exports = LeftPanel;
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index d95d5cd652..231a6ef6b6 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -189,13 +189,13 @@ const LoggedInView = React.createClass({
     _updateServerNoticeEvents: async function() {
         const roomLists = RoomListStore.getRoomLists();
         if (!roomLists['m.server_notice']) return [];
-        
+
         const pinnedEvents = [];
         for (const room of roomLists['m.server_notice']) {
             const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
 
             if (!pinStateEvent || !pinStateEvent.getContent().pinned) continue;
-            
+
             const pinnedEventIds = pinStateEvent.getContent().pinned.slice(0, MAX_PINNED_NOTICES_PER_ROOM);
             for (const eventId of pinnedEventIds) {
                 const timeline = await this._matrixClient.getEventTimeline(room.getUnfilteredTimelineSet(), eventId, 0);
@@ -207,7 +207,7 @@ const LoggedInView = React.createClass({
             serverNoticeEvents: pinnedEvents,
         });
     },
-    
+
 
     _onKeyDown: function(ev) {
             /*
diff --git a/src/components/structures/LoginBox.js b/src/components/structures/LoginBox.js
index a2269706ee..168014daa5 100644
--- a/src/components/structures/LoginBox.js
+++ b/src/components/structures/LoginBox.js
@@ -53,5 +53,5 @@ module.exports = React.createClass({
                 { loginButton }
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index f417932fd0..4c7d004015 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -16,18 +16,18 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var MatrixClientPeg = require('../../MatrixClientPeg');
-var ContentRepo = require("matrix-js-sdk").ContentRepo;
-var Modal = require('../../Modal');
-var sdk = require('../../index');
-var dis = require('../../dispatcher');
+const MatrixClientPeg = require('../../MatrixClientPeg');
+const ContentRepo = require("matrix-js-sdk").ContentRepo;
+const Modal = require('../../Modal');
+const sdk = require('../../index');
+const dis = require('../../dispatcher');
 
-var linkify = require('linkifyjs');
-var linkifyString = require('linkifyjs/string');
-var linkifyMatrix = require('../../linkify-matrix');
-var sanitizeHtml = require('sanitize-html');
+const linkify = require('linkifyjs');
+const linkifyString = require('linkifyjs/string');
+const linkifyMatrix = require('../../linkify-matrix');
+const sanitizeHtml = require('sanitize-html');
 import Promise from 'bluebird';
 
 import { _t } from '../../languageHandler';
@@ -46,7 +46,7 @@ module.exports = React.createClass({
     getDefaultProps: function() {
         return {
             config: {},
-        }
+        };
     },
 
     getInitialState: function() {
@@ -58,7 +58,7 @@ module.exports = React.createClass({
             includeAll: false,
             roomServer: null,
             filterString: null,
-        }
+        };
     },
 
     componentWillMount: function() {
@@ -134,13 +134,12 @@ module.exports = React.createClass({
             opts.include_all_networks = true;
         }
         if (this.nextBatch) opts.since = this.nextBatch;
-        if (my_filter_string) opts.filter = { generic_search_term: my_filter_string } ;
+        if (my_filter_string) opts.filter = { generic_search_term: my_filter_string };
         return MatrixClientPeg.get().publicRooms(opts).then((data) => {
             if (
                 my_filter_string != this.state.filterString ||
                 my_server != this.state.roomServer ||
-                my_next_batch != this.nextBatch)
-            {
+                my_next_batch != this.nextBatch) {
                 // if the filter or server has changed since this request was sent,
                 // throw away the result (don't even clear the busy flag
                 // since we must still have a request in flight)
@@ -163,8 +162,7 @@ module.exports = React.createClass({
             if (
                 my_filter_string != this.state.filterString ||
                 my_server != this.state.roomServer ||
-                my_next_batch != this.nextBatch)
-            {
+                my_next_batch != this.nextBatch) {
                 // as above: we don't care about errors for old
                 // requests either
                 return;
@@ -177,10 +175,10 @@ module.exports = React.createClass({
 
             this.setState({ loading: false });
             console.error("Failed to get publicRooms: %s", JSON.stringify(err));
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to get public room list', '', ErrorDialog, {
                 title: _t('Failed to get public room list'),
-                description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded'))
+                description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded')),
             });
         });
     },
@@ -193,13 +191,13 @@ module.exports = React.createClass({
      * this needs SPEC-417.
      */
     removeFromDirectory: function(room) {
-        var alias = get_display_alias_for_room(room);
-        var name = room.name || alias || _t('Unnamed room');
+        const alias = get_display_alias_for_room(room);
+        const name = room.name || alias || _t('Unnamed room');
 
-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
-        var desc;
+        let desc;
         if (alias) {
             desc = _t('Delete the room alias %(alias)s and remove %(name)s from the directory?', {alias: alias, name: name});
         } else {
@@ -212,9 +210,9 @@ module.exports = React.createClass({
             onFinished: (should_delete) => {
                 if (!should_delete) return;
 
-                var Loader = sdk.getComponent("elements.Spinner");
-                var modal = Modal.createDialog(Loader);
-                var step = _t('remove %(name)s from the directory.', {name: name});
+                const Loader = sdk.getComponent("elements.Spinner");
+                const modal = Modal.createDialog(Loader);
+                let step = _t('remove %(name)s from the directory.', {name: name});
 
                 MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
                     if (!alias) return;
@@ -229,10 +227,10 @@ module.exports = React.createClass({
                     console.error("Failed to " + step + ": " + err);
                     Modal.createTrackedDialog('Remove from Directory Error', '', ErrorDialog, {
                         title: _t('Error'),
-                        description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded'))
+                        description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded')),
                     });
                 });
-            }
+            },
         });
     },
 
@@ -347,7 +345,7 @@ module.exports = React.createClass({
     },
 
     showRoom: function(room, room_alias) {
-        var payload = {action: 'view_room'};
+        const payload = {action: 'view_room'};
         if (room) {
             // Don't let the user view a room they won't be able to either
             // peek or join: fail earlier so they don't have to click back
@@ -383,16 +381,16 @@ module.exports = React.createClass({
     },
 
     getRows: function() {
-        var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
         if (!this.state.publicRooms) return [];
 
-        var rooms = this.state.publicRooms;
-        var rows = [];
-        var self = this;
-        var guestRead, guestJoin, perms;
-        for (var i = 0; i < rooms.length; i++) {
-            var name = rooms[i].name || get_display_alias_for_room(rooms[i]) || _t('Unnamed room');
+        const rooms = this.state.publicRooms;
+        const rows = [];
+        const self = this;
+        let guestRead; let guestJoin; let perms;
+        for (let i = 0; i < rooms.length; i++) {
+            const name = rooms[i].name || get_display_alias_for_room(rooms[i]) || _t('Unnamed room');
             guestRead = null;
             guestJoin = null;
 
@@ -412,7 +410,7 @@ module.exports = React.createClass({
                 perms = <div className="mx_RoomDirectory_perms">{guestRead}{guestJoin}</div>;
             }
 
-            var topic = rooms[i].topic || '';
+            let topic = rooms[i].topic || '';
             topic = linkifyString(sanitizeHtml(topic));
 
             rows.push(
@@ -432,14 +430,14 @@ module.exports = React.createClass({
                         <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
                         { perms }
                         <div className="mx_RoomDirectory_topic"
-                             onClick={ function(e) { e.stopPropagation() } }
-                             dangerouslySetInnerHTML={{ __html: topic }}/>
+                             onClick={ function(e) { e.stopPropagation(); } }
+                             dangerouslySetInnerHTML={{ __html: topic }} />
                         <div className="mx_RoomDirectory_alias">{ get_display_alias_for_room(rooms[i]) }</div>
                     </td>
                     <td className="mx_RoomDirectory_roomMemberCount">
                         { rooms[i].num_joined_members }
                     </td>
-                </tr>
+                </tr>,
             );
         }
         return rows;
@@ -524,7 +522,7 @@ module.exports = React.createClass({
                 onFillRequest={ this.onFillRequest }
                 stickyBottom={false}
                 startAtBottom={false}
-                onResize={function(){}}
+                onResize={function() {}}
             >
                 { scrollpanel_content }
             </ScrollPanel>;
@@ -577,11 +575,11 @@ module.exports = React.createClass({
                 </div>
             </div>
         );
-    }
+    },
 });
 
 // Similar to matrix-react-sdk's MatrixTools.getDisplayAliasForRoom
 // but works with the objects we get from the public room list
 function get_display_alias_for_room(room) {
-    return  room.canonical_alias || (room.aliases ? room.aliases[0] : "");
+    return room.canonical_alias || (room.aliases ? room.aliases[0] : "");
 }
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index c6a6e1e2d3..b4d70f3397 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -37,7 +37,7 @@ function getUnsentMessages(room) {
     return room.getPendingEvents().filter(function(ev) {
         return ev.status === Matrix.EventStatus.NOT_SENT;
     });
-};
+}
 
 module.exports = React.createClass({
     displayName: 'RoomStatusBar',
@@ -303,7 +303,7 @@ module.exports = React.createClass({
         const errorIsMauError = Boolean(
             this.state.syncStateData &&
             this.state.syncStateData.error &&
-            this.state.syncStateData.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED'
+            this.state.syncStateData.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED',
         );
         return this.state.syncState === "ERROR" && !errorIsMauError;
     },
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 53644af78f..dd57bd7636 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1673,7 +1673,7 @@ module.exports = React.createClass({
             </AuxPanel>
         );
 
-        let messageComposer, searchInfo;
+        let messageComposer; let searchInfo;
         const canSpeak = (
             // joined and not showing search results
             myMembership === 'join' && !this.state.searchResults
@@ -1692,7 +1692,7 @@ module.exports = React.createClass({
 
         if (MatrixClientPeg.get().isGuest()) {
             const LoginBox = sdk.getComponent('structures.LoginBox');
-            messageComposer = <LoginBox/>;
+            messageComposer = <LoginBox />;
         }
 
         // TODO: Why aren't we storing the term/scope/count in this format
@@ -1706,7 +1706,7 @@ module.exports = React.createClass({
         }
 
         if (inCall) {
-            let zoomButton, voiceMuteButton, videoMuteButton;
+            let zoomButton; let voiceMuteButton; let videoMuteButton;
 
             if (call.type === "video") {
                 zoomButton = (
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 459df3bd26..d1f4cd30fa 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -72,7 +72,7 @@ module.exports = React.createClass({
         function() {
             this.props.onSearch(this.refs.search.value);
         },
-        100
+        100,
     ),
 
     onToggleCollapse: function(show) {
@@ -80,8 +80,7 @@ module.exports = React.createClass({
             dis.dispatch({
                 action: 'show_left_panel',
             });
-        }
-        else {
+        } else {
             dis.dispatch({
                 action: 'hide_left_panel',
             });
@@ -103,25 +102,24 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var TintableSvg = sdk.getComponent('elements.TintableSvg');
+        const TintableSvg = sdk.getComponent('elements.TintableSvg');
 
-        var collapseTabIndex = this.refs.search && this.refs.search.value !== "" ? "-1" : "0";
+        const collapseTabIndex = this.refs.search && this.refs.search.value !== "" ? "-1" : "0";
 
-        var toggleCollapse;
+        let toggleCollapse;
         if (this.props.collapsed) {
             toggleCollapse =
                 <AccessibleButton className="mx_SearchBox_maximise" tabIndex={collapseTabIndex} onClick={ this.onToggleCollapse.bind(this, true) }>
-                    <TintableSvg src="img/maximise.svg" width="10" height="16" alt={ _t("Expand panel") }/>
-                </AccessibleButton>
-        }
-        else {
+                    <TintableSvg src="img/maximise.svg" width="10" height="16" alt={ _t("Expand panel") } />
+                </AccessibleButton>;
+        } else {
             toggleCollapse =
                 <AccessibleButton className="mx_SearchBox_minimise" tabIndex={collapseTabIndex} onClick={ this.onToggleCollapse.bind(this, false) }>
-                    <TintableSvg src="img/minimise.svg" width="10" height="16" alt={ _t("Collapse panel") }/>
-                </AccessibleButton>
+                    <TintableSvg src="img/minimise.svg" width="10" height="16" alt={ _t("Collapse panel") } />
+                </AccessibleButton>;
         }
 
-        var searchControls;
+        let searchControls;
         if (!this.props.collapsed) {
             searchControls = [
                     this.state.searchTerm.length > 0 ?
@@ -148,16 +146,16 @@ module.exports = React.createClass({
                         onChange={ this.onChange }
                         onKeyDown={ this._onKeyDown }
                         placeholder={ _t('Filter room names') }
-                    />
+                    />,
                 ];
         }
 
-        var self = this;
+        const self = this;
         return (
             <div className="mx_SearchBox">
                 { searchControls }
                 { toggleCollapse }
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index e06c652924..44d14cd7cf 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -829,7 +829,7 @@ var TimelinePanel = React.createClass({
         // 4. Also, if pos === null, the event might not be paginated - show the unread bar
         const pos = this.getReadMarkerPosition();
         return this.state.readMarkerEventId !== null && // 1.
-            this.state.readMarkerEventId !== this._getCurrentReadReceipt() &&  // 2.
+            this.state.readMarkerEventId !== this._getCurrentReadReceipt() && // 2.
             (pos < 0 || pos === null); // 3., 4.
     },
 
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 772eb70dde..40dccd7839 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -845,7 +845,7 @@ module.exports = React.createClass({
         SettingsStore.getLabsFeatures().forEach((featureId) => {
             // TODO: this ought to be a separate component so that we don't need
             // to rebind the onChange each time we render
-            const onChange = async (e) => {
+            const onChange = async(e) => {
                 const checked = e.target.checked;
                 if (featureId === "feature_lazyloading") {
                     const confirmed = await this._onLazyLoadChanging(checked);
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 3a5d35a561..4844149f59 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -53,5 +53,5 @@ module.exports = React.createClass({
                 </SyntaxHighlight>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index d191368b17..a9db1165e8 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -79,7 +79,7 @@ module.exports = React.createClass({
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
         let {member, fallbackUserId, onClick, viewUserOnClick, ...otherProps} = this.props;
-        let userId = member ? member.userId : fallbackUserId;
+        const userId = member ? member.userId : fallbackUserId;
 
         if (viewUserOnClick) {
             onClick = () => {
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index e30acca16d..2dd611843a 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -48,7 +48,7 @@ export default class GroupInviteTileContextMenu extends React.Component {
         Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, {
             title: _t('Reject invitation'),
             description: _t('Are you sure you want to reject the invitation?'),
-            onFinished: async (shouldLeave) => {
+            onFinished: async(shouldLeave) => {
                 if (!shouldLeave) return;
 
                 // FIXME: controller shouldn't be loading a view :(
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js
index e71fcdb624..b93678b2ab 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.js
@@ -31,13 +31,13 @@ export default class ChangelogDialog extends React.Component {
     componentDidMount() {
         const version = this.props.newVersion.split('-');
         const version2 = this.props.version.split('-');
-        if(version == null || version2 == null) return;
+        if (version == null || version2 == null) return;
         // parse versions of form: [vectorversion]-react-[react-sdk-version]-js-[js-sdk-version]
-        for(let i=0; i<REPOS.length; i++) {
+        for (let i=0; i<REPOS.length; i++) {
             const oldVersion = version2[2*i];
             const newVersion = version[2*i];
             request(`https://api.github.com/repos/${REPOS[i]}/compare/${oldVersion}...${newVersion}`, (a, b, body) => {
-                if(body == null) return;
+                if (body == null) return;
                 this.setState({[REPOS[i]]: JSON.parse(body).commits});
             });
         }
@@ -66,7 +66,7 @@ export default class ChangelogDialog extends React.Component {
                     {this.state[repo].map(this._elementsForCommit)}
                     </ul>
                 </div>
-            )
+            );
         });
 
         const content = (
@@ -83,7 +83,7 @@ export default class ChangelogDialog extends React.Component {
                 button={_t("Update")}
                 onFinished={this.props.onFinished}
                 />
-        )
+        );
     }
 }
 
diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index 550abe5299..19b7d83717 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -26,7 +26,6 @@ import Unread from '../../../Unread';
 import classNames from 'classnames';
 
 export default class ChatCreateOrReuseDialog extends React.Component {
-
     constructor(props) {
         super(props);
         this.onFinished = this.onFinished.bind(this);
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index b45bd286f2..ad51f501fb 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -153,8 +153,8 @@ export default class NetworkDropdown extends React.Component {
 
                         const sortedInstances = this.props.protocols[proto].instances;
                         sortedInstances.sort(function(x, y) {
-                            const a = x.desc
-                            const b = y.desc
+                            const a = x.desc;
+                            const b = y.desc;
                             if (a < b) {
                                 return -1;
                             } else if (a > b) {
@@ -208,7 +208,7 @@ export default class NetworkDropdown extends React.Component {
         return <div key={key} className="mx_NetworkDropdown_networkoption" onClick={click_handler}>
             {icon}
             <span className="mx_NetworkDropdown_menu_network">{name}</span>
-        </div>
+        </div>;
     }
 
     render() {
@@ -223,11 +223,11 @@ export default class NetworkDropdown extends React.Component {
             current_value = <input type="text" className="mx_NetworkDropdown_networkoption"
                 ref={this.collectInputTextBox} onKeyUp={this.onInputKeyUp}
                 placeholder="matrix.org" // 'matrix.org' as an example of an HS name
-            />
+            />;
         } else {
             const instance = instanceForInstanceId(this.props.protocols, this.state.selectedInstanceId);
             current_value = this._makeMenuOption(
-                this.state.selectedServer, instance, this.state.includeAll, false
+                this.state.selectedServer, instance, this.state.includeAll, false,
             );
         }
 
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index c775cba610..b88fbdfc06 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -78,7 +78,7 @@ export default React.createClass({
     },
 
     render: function() {
-        let blacklistButton = null, verifyButton = null;
+        let blacklistButton = null; let verifyButton = null;
 
         if (this.state.device.isBlocked()) {
             blacklistButton = (
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index 064d2f1c39..3bf37df951 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -122,7 +122,6 @@ export default class EditableTextContainer extends React.Component {
             );
         }
     }
-
 }
 
 EditableTextContainer.propTypes = {
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index f3ad5a9696..4ac5eda170 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -16,13 +16,13 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
-var MatrixClientPeg = require('../../../MatrixClientPeg');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
 
 import {formatDate} from '../../../DateUtils';
-var filesize = require('filesize');
-var AccessibleButton = require('../../../components/views/elements/AccessibleButton');
+const filesize = require('filesize');
+const AccessibleButton = require('../../../components/views/elements/AccessibleButton');
 const Modal = require('../../../Modal');
 const sdk = require('../../../index');
 import { _t } from '../../../languageHandler';
@@ -69,24 +69,24 @@ module.exports = React.createClass({
         Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
             onFinished: (proceed) => {
                 if (!proceed) return;
-                var self = this;
+                const self = this;
                 MatrixClientPeg.get().redactEvent(
-                    this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
+                    this.props.mxEvent.getRoomId(), this.props.mxEvent.getId(),
                 ).catch(function(e) {
-                    var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     // display error message stating you couldn't delete this.
-                    var code = e.errcode || e.statusCode;
+                    const code = e.errcode || e.statusCode;
                     Modal.createTrackedDialog('You cannot delete this image.', '', ErrorDialog, {
                         title: _t('Error'),
-                        description: _t('You cannot delete this image. (%(code)s)', {code: code})
+                        description: _t('You cannot delete this image. (%(code)s)', {code: code}),
                     });
                 }).done();
-            }
+            },
         });
     },
 
-    getName: function () {
-        var name = this.props.name;
+    getName: function() {
+        let name = this.props.name;
         if (name && this.props.link) {
             name = <a href={ this.props.link } target="_blank" rel="noopener">{ name }</a>;
         }
@@ -94,7 +94,6 @@ module.exports = React.createClass({
     },
 
     render: function() {
-
 /*
         // In theory max-width: 80%, max-height: 80% on the CSS should work
         // but in practice, it doesn't, so do it manually:
@@ -123,7 +122,7 @@ module.exports = React.createClass({
             height: displayHeight
         };
 */
-        var style, res;
+        let style; let res;
 
         if (this.props.width && this.props.height) {
             style = {
@@ -133,23 +132,22 @@ module.exports = React.createClass({
             res = style.width + "x" + style.height + "px";
         }
 
-        var size;
+        let size;
         if (this.props.fileSize) {
             size = filesize(this.props.fileSize);
         }
 
-        var size_res;
+        let size_res;
         if (size && res) {
             size_res = size + ", " + res;
-        }
-        else {
+        } else {
             size_res = size || res;
         }
 
-        var showEventMeta = !!this.props.mxEvent;
+        const showEventMeta = !!this.props.mxEvent;
 
-        var eventMeta;
-        if(showEventMeta) {
+        let eventMeta;
+        if (showEventMeta) {
             // Figure out the sender, defaulting to mxid
             let sender = this.props.mxEvent.getSender();
             const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
@@ -163,8 +161,8 @@ module.exports = React.createClass({
             </div>);
         }
 
-        var eventRedact;
-        if(showEventMeta) {
+        let eventRedact;
+        if (showEventMeta) {
             eventRedact = (<div className="mx_ImageView_button" onClick={this.onRedactClick}>
                 { _t('Remove') }
             </div>);
@@ -175,10 +173,10 @@ module.exports = React.createClass({
                 <div className="mx_ImageView_lhs">
                 </div>
                 <div className="mx_ImageView_content">
-                    <img src={this.props.src} style={style}/>
+                    <img src={this.props.src} style={style} />
                     <div className="mx_ImageView_labelWrapper">
                         <div className="mx_ImageView_label">
-                            <AccessibleButton className="mx_ImageView_cancel" onClick={ this.props.onFinished }><img src="img/cancel-white.svg" width="18" height="18" alt={ _t('Close') }/></AccessibleButton>
+                            <AccessibleButton className="mx_ImageView_cancel" onClick={ this.props.onFinished }><img src="img/cancel-white.svg" width="18" height="18" alt={ _t('Close') } /></AccessibleButton>
                             <div className="mx_ImageView_shim">
                             </div>
                             <div className="mx_ImageView_name">
@@ -187,7 +185,7 @@ module.exports = React.createClass({
                             { eventMeta }
                             <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } target="_blank" rel="noopener">
                                 <div className="mx_ImageView_download">
-                                        { _t('Download this file') }<br/>
+                                        { _t('Download this file') }<br />
                                          <span className="mx_ImageView_size">{ size_res }</span>
                                 </div>
                             </a>
@@ -201,5 +199,5 @@ module.exports = React.createClass({
                 </div>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/InlineSpinner.js b/src/components/views/elements/InlineSpinner.js
index adb916fcf0..cce4705512 100644
--- a/src/components/views/elements/InlineSpinner.js
+++ b/src/components/views/elements/InlineSpinner.js
@@ -20,14 +20,14 @@ module.exports = React.createClass({
     displayName: 'InlineSpinner',
 
     render: function() {
-        var w = this.props.w || 16;
-        var h = this.props.h || 16;
-        var imgClass = this.props.imgClassName || "";
+        const w = this.props.w || 16;
+        const h = this.props.h || 16;
+        const imgClass = this.props.imgClassName || "";
 
         return (
             <div className="mx_InlineSpinner">
-                <img src="img/spinner.gif" width={w} height={h} className={imgClass}/>
+                <img src="img/spinner.gif" width={w} height={h} className={imgClass} />
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index ff839de2a9..d23d6488b6 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -54,7 +54,6 @@ function getOrCreateContainer(containerId) {
  * bounding rect as the parent of PE.
  */
 export default class PersistedElement extends React.Component {
-
     static propTypes = {
         // Unique identifier for this PersistedElement instance
         // Any PersistedElements with the same persistKey will use
diff --git a/src/components/views/elements/Spinner.js b/src/components/views/elements/Spinner.js
index 2b620f12c5..67fde4bf66 100644
--- a/src/components/views/elements/Spinner.js
+++ b/src/components/views/elements/Spinner.js
@@ -16,19 +16,19 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+const React = require('react');
 
 module.exports = React.createClass({
     displayName: 'Spinner',
 
     render: function() {
-        var w = this.props.w || 32;
-        var h = this.props.h || 32;
-        var imgClass = this.props.imgClassName || "";
+        const w = this.props.w || 32;
+        const h = this.props.h || 32;
+        const imgClass = this.props.imgClassName || "";
         return (
             <div className="mx_Spinner">
-                <img src="img/spinner.gif" width={w} height={h} className={imgClass}/>
+                <img src="img/spinner.gif" width={w} height={h} className={imgClass} />
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/elements/TintableSvgButton.js b/src/components/views/elements/TintableSvgButton.js
index 4bfe46d43f..a3f5b7db5d 100644
--- a/src/components/views/elements/TintableSvgButton.js
+++ b/src/components/views/elements/TintableSvgButton.js
@@ -20,7 +20,6 @@ import TintableSvg from './TintableSvg';
 import AccessibleButton from './AccessibleButton';
 
 export default class TintableSvgButton extends React.Component {
-
     constructor(props) {
         super(props);
     }
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index 45feede5a0..400d9e0c83 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -39,7 +39,7 @@ module.exports = React.createClass({
                 <div className="mx_MatrixToolbar_content">
                    { _t('You are not receiving desktop notifications') } <a className="mx_MatrixToolbar_link" onClick={ this.onClick }> { _t('Enable them now') }</a>
                 </div>
-                <AccessibleButton className="mx_MatrixToolbar_close" onClick={ this.hideToolbar } ><img src="img/cancel.svg" width="18" height="18" alt={_t('Close')}/></AccessibleButton>
+                <AccessibleButton className="mx_MatrixToolbar_close" onClick={ this.hideToolbar } ><img src="img/cancel.svg" width="18" height="18" alt={_t('Close')} /></AccessibleButton>
             </div>
         );
     },
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
index 1bd0bde526..47eed4dc59 100644
--- a/src/components/views/globals/NewVersionBar.js
+++ b/src/components/views/globals/NewVersionBar.js
@@ -45,10 +45,10 @@ export default React.createClass({
             description: <div className="mx_MatrixToolbar_changelog">{releaseNotes}</div>,
             button: _t("Update"),
             onFinished: (update) => {
-                if(update && PlatformPeg.get()) {
+                if (update && PlatformPeg.get()) {
                     PlatformPeg.get().installUpdate();
                 }
-            }
+            },
         });
     },
 
@@ -58,10 +58,10 @@ export default React.createClass({
             version: this.props.version,
             newVersion: this.props.newVersion,
             onFinished: (update) => {
-                if(update && PlatformPeg.get()) {
+                if (update && PlatformPeg.get()) {
                     PlatformPeg.get().installUpdate();
                 }
-            }
+            },
         });
     },
 
@@ -103,5 +103,5 @@ export default React.createClass({
                 {action_button}
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js
index e499ddab31..4610dbdb12 100644
--- a/src/components/views/globals/UpdateCheckBar.js
+++ b/src/components/views/globals/UpdateCheckBar.js
@@ -32,14 +32,14 @@ export default React.createClass({
     getDefaultProps: function() {
         return {
             detail: '',
-        }
+        };
     },
 
     getStatusText: function() {
         // we can't import the enum from riot-web as we don't want matrix-react-sdk
         // to depend on riot-web. so we grab it as a normal object via API instead.
         const updateCheckStatusEnum = PlatformPeg.get().getUpdateCheckStatusEnum();
-        switch(this.props.status) {
+        switch (this.props.status) {
             case updateCheckStatusEnum.ERROR:
                 return _t('Error encountered (%(errorDetail)s).', { errorDetail: this.props.detail });
             case updateCheckStatusEnum.CHECKING:
@@ -59,7 +59,7 @@ export default React.createClass({
         const message = this.getStatusText();
         const warning = _t('Warning');
 
-        if (!'getUpdateCheckStatusEnum' in PlatformPeg.get()) {
+        if (!('getUpdateCheckStatusEnum' in PlatformPeg.get())) {
             return <div></div>;
         }
 
@@ -83,9 +83,9 @@ export default React.createClass({
                     {message}
                 </div>
                 <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.hideToolbar}>
-                    <img src="img/cancel.svg" width="18" height="18" alt={_t('Close')}/>
+                    <img src="img/cancel.svg" width="18" height="18" alt={_t('Close')} />
                 </AccessibleButton>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index 6e0e5d538a..481cdc60b2 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -296,7 +296,7 @@ export const TermsAuthEntry = React.createClass({
             return <Loader />;
         }
 
-        let checkboxes = [];
+        const checkboxes = [];
         let allChecked = true;
         for (const policy of this.state.policies) {
             const checked = this.state.toggledPolicies[policy.id];
@@ -306,7 +306,7 @@ export const TermsAuthEntry = React.createClass({
                 <label key={"policy_checkbox_" + policy.id}>
                     <input type="checkbox" onClick={() => this._trySubmit(policy.id)} checked={checked} />
                     <a href={policy.url} target="_blank" rel="noopener">{ policy.name }</a>
-                </label>
+                </label>,
             );
         }
 
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 92a025f10c..de5d3db625 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -103,7 +103,7 @@ module.exports = React.createClass({
             oldCanonicalAlias = this.props.canonicalAliasEvent.getContent().alias;
         }
 
-        let newCanonicalAlias = this.state.canonicalAlias;
+        const newCanonicalAlias = this.state.canonicalAlias;
 
         if (this.props.canSetCanonicalAlias && oldCanonicalAlias !== newCanonicalAlias) {
             console.log("AliasSettings: Updating canonical alias");
@@ -167,7 +167,7 @@ module.exports = React.createClass({
 
         if (!this.props.canonicalAlias) {
             this.setState({
-                canonicalAlias: alias
+                canonicalAlias: alias,
             });
         }
     },
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.js
index 757204f0c8..e75456ea50 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.js
@@ -33,7 +33,6 @@ import Autocompleter from '../../../autocomplete/Autocompleter';
 const COMPOSER_SELECTED = 0;
 
 export default class Autocomplete extends React.Component {
-
     constructor(props) {
         super(props);
 
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 2c70f36e07..7f74176878 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -107,7 +107,7 @@ module.exports = React.createClass({
 
         // FIXME: do we want to factor out all image displaying between this and MImageBody - especially for lightboxing?
         let image = p["og:image"];
-        let imageMaxWidth = 100, imageMaxHeight = 100;
+        const imageMaxWidth = 100; const imageMaxHeight = 100;
         if (image && image.startsWith("mxc://")) {
             image = MatrixClientPeg.get().mxcUrlToHttp(image, imageMaxWidth, imageMaxHeight);
         }
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 037957c868..7ff52ecbb6 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -712,7 +712,7 @@ module.exports = withMatrixClient(React.createClass({
 
             if (!member || !member.membership || member.membership === 'leave') {
                 const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
-                const onInviteUserButton = async () => {
+                const onInviteUserButton = async() => {
                     try {
                         await cli.invite(roomId, member.userId);
                     } catch (err) {
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 66f3fdaa97..8df6a76836 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -269,7 +269,7 @@ export default class MessageComposer extends React.Component {
             );
         }
 
-        let e2eImg, e2eTitle, e2eClass;
+        let e2eImg; let e2eTitle; let e2eClass;
         const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
         if (roomIsEncrypted) {
             // FIXME: show a /!\ if there are untrusted devices in the room...
@@ -429,7 +429,7 @@ export default class MessageComposer extends React.Component {
                              className="mx_MessageComposer_formatbar_cancel mx_filterFlipColor"
                              src="img/icon-text-cancel.svg" />
                     </div>
-                </div>
+                </div>;
         }
 
         return (
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 6f56d35105..14d394ab41 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -67,7 +67,7 @@ const EMOJI_UNICODE_TO_SHORTNAME = mapUnicodeToShort();
 const REGEX_EMOJI_WHITESPACE = new RegExp('(?:^|\\s)(' + asciiRegexp + ')\\s$');
 const EMOJI_REGEX = new RegExp(unicodeRegexp, 'g');
 
-const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
+const TYPING_USER_TIMEOUT = 10000; const TYPING_SERVER_TIMEOUT = 30000;
 
 const ENTITY_TYPES = {
     AT_ROOM_PILL: 'ATROOMPILL',
@@ -175,8 +175,8 @@ export default class MessageComposerInput extends React.Component {
         // see https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
         this.direction = '';
 
-        this.plainWithMdPills    = new PlainWithPillsSerializer({ pillFormat: 'md' });
-        this.plainWithIdPills    = new PlainWithPillsSerializer({ pillFormat: 'id' });
+        this.plainWithMdPills = new PlainWithPillsSerializer({ pillFormat: 'md' });
+        this.plainWithIdPills = new PlainWithPillsSerializer({ pillFormat: 'id' });
         this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
 
         this.md = new Md({
@@ -1078,7 +1078,7 @@ export default class MessageComposerInput extends React.Component {
 
         // only look for commands if the first block contains simple unformatted text
         // i.e. no pills or rich-text formatting and begins with a /.
-        let cmd, commandText;
+        let cmd; let commandText;
         const firstChild = editorState.document.nodes.get(0);
         const firstGrandChild = firstChild && firstChild.nodes.get(0);
         if (firstChild && firstGrandChild &&
@@ -1260,7 +1260,7 @@ export default class MessageComposerInput extends React.Component {
         }
     };
 
-    selectHistory = async (up) => {
+    selectHistory = async(up) => {
         const delta = up ? -1 : 1;
 
         // True if we are not currently selecting history, but composing a message
@@ -1308,7 +1308,7 @@ export default class MessageComposerInput extends React.Component {
         return true;
     };
 
-    onTab = async (e) => {
+    onTab = async(e) => {
         this.setState({
             someCompletions: null,
         });
@@ -1330,7 +1330,7 @@ export default class MessageComposerInput extends React.Component {
         up ? this.autocomplete.onUpArrow() : this.autocomplete.onDownArrow();
     };
 
-    onEscape = async (e) => {
+    onEscape = async(e) => {
         e.preventDefault();
         if (this.autocomplete) {
             this.autocomplete.onEscape(e);
@@ -1349,7 +1349,7 @@ export default class MessageComposerInput extends React.Component {
     /* If passed null, restores the original editor content from state.originalEditorState.
      * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
      */
-    setDisplayedCompletion = async (displayedCompletion: ?Completion): boolean => {
+    setDisplayedCompletion = async(displayedCompletion: ?Completion): boolean => {
         const activeEditorState = this.state.originalEditorState || this.state.editorState;
 
         if (displayedCompletion == null) {
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 9d3dbe5217..3c767b726a 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -93,7 +93,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        let joinBlock, previewBlock;
+        let joinBlock; let previewBlock;
 
         if (this.props.spinner || this.state.busy) {
             const Spinner = sdk.getComponent("elements.Spinner");
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index b69938a117..8cd559f2ea 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -657,31 +657,31 @@ module.exports = React.createClass({
         const userLevels = powerLevels.users || {};
 
         const powerLevelDescriptors = {
-            users_default: {
+            "users_default": {
                 desc: _t('The default role for new room members is'),
                 defaultValue: 0,
             },
-            events_default: {
+            "events_default": {
                 desc: _t('To send messages, you must be a'),
                 defaultValue: 0,
             },
-            invite: {
+            "invite": {
                 desc: _t('To invite users into the room, you must be a'),
                 defaultValue: 50,
             },
-            state_default: {
+            "state_default": {
                 desc: _t('To configure the room, you must be a'),
                 defaultValue: 50,
             },
-            kick: {
+            "kick": {
                 desc: _t('To kick users, you must be a'),
                 defaultValue: 50,
             },
-            ban: {
+            "ban": {
                 desc: _t('To ban users, you must be a'),
                 defaultValue: 50,
             },
-            redact: {
+            "redact": {
                 desc: _t('To remove other users\' messages, you must be a'),
                 defaultValue: 50,
             },
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index ea727a03b5..72ad2943aa 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -67,7 +67,7 @@ module.exports = React.createClass({
     phases: {
         LOADING: "LOADING", // The component is loading or sending data to the hs
         DISPLAY: "DISPLAY", // The component is ready and display data
-        ERROR: "ERROR",      // There was an error
+        ERROR: "ERROR", // There was an error
     },
 
     propTypes: {
@@ -86,14 +86,14 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             phase: this.phases.LOADING,
-            masterPushRule: undefined,      // The master rule ('.m.rule.master')
-            vectorPushRules: [],            // HS default push rules displayed in Vector UI
-            vectorContentRules: {           // Keyword push rules displayed in Vector UI
+            masterPushRule: undefined, // The master rule ('.m.rule.master')
+            vectorPushRules: [], // HS default push rules displayed in Vector UI
+            vectorContentRules: { // Keyword push rules displayed in Vector UI
                 vectorState: PushRuleVectorState.ON,
                 rules: [],
             },
-            externalPushRules: [],          // Push rules (except content rule) that have been defined outside Vector UI
-            externalContentRules: [],        // Keyword push rules that have been defined outside Vector UI
+            externalPushRules: [], // Push rules (except content rule) that have been defined outside Vector UI
+            externalContentRules: [], // Keyword push rules that have been defined outside Vector UI
         };
     },
 
@@ -290,7 +290,7 @@ module.exports = React.createClass({
         for (const i in this.state.vectorContentRules.rules) {
             const rule = this.state.vectorContentRules.rules[i];
 
-            let enabled, actions;
+            let enabled; let actions;
             switch (newPushRuleVectorState) {
                 case PushRuleVectorState.ON:
                     if (rule.actions.length !== 1) {
diff --git a/src/notifications/StandardActions.js b/src/notifications/StandardActions.js
index 22a8f1db40..30d6ea5975 100644
--- a/src/notifications/StandardActions.js
+++ b/src/notifications/StandardActions.js
@@ -16,9 +16,9 @@ limitations under the License.
 
 'use strict';
 
-var NotificationUtils = require('./NotificationUtils');
+const NotificationUtils = require('./NotificationUtils');
 
-var encodeActions = NotificationUtils.encodeActions;
+const encodeActions = NotificationUtils.encodeActions;
 
 module.exports = {
     ACTION_NOTIFY: encodeActions({notify: true}),
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index cb6d83e884..bb3f412a9b 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -248,7 +248,7 @@ export default class SettingsStore {
         if (actualValue !== undefined && actualValue !== null) return actualValue;
         return calculatedValue;
     }
-    /* eslint-disable valid-jsdoc */    //https://github.com/eslint/eslint/issues/7307
+    /* eslint-disable valid-jsdoc */ //https://github.com/eslint/eslint/issues/7307
     /**
      * Sets the value for a setting. The room ID is optional if the setting is not being
      * set for a particular room, otherwise it should be supplied. The value may be null
diff --git a/src/settings/controllers/SettingController.js b/src/settings/controllers/SettingController.js
index 0ebe0042e6..a7d0ccf21a 100644
--- a/src/settings/controllers/SettingController.js
+++ b/src/settings/controllers/SettingController.js
@@ -23,7 +23,6 @@ limitations under the License.
  * intended to handle environmental factors for specific settings.
  */
 export default class SettingController {
-
     /**
      * Gets the overridden value for the setting, if any. This must return null if the
      * value is not to be overridden, otherwise it must return the new value.
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 67c0c13be7..c670161dbc 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -23,7 +23,6 @@ import Unread from '../Unread';
  * the RoomList.
  */
 class RoomListStore extends Store {
-
     static _listOrders = {
         "m.favourite": "manual",
         "im.vector.fake.invite": "recent",
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index bb5e4d706b..af65b6f001 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -93,7 +93,7 @@ export default class DMRoomMap {
                         return {userId, roomId};
                     }
                 }
-            }).filter((ids) => !!ids);  //filter out
+            }).filter((ids) => !!ids); //filter out
             // these are actually all legit self-chats
             // bail out
             if (!guessedUserIdsThatChanged.length) {
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index 92c2e3644d..ea0e4c3fb0 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -77,7 +77,7 @@ const ALLOWED_BLOB_MIMETYPES = {
     'audio/x-pn-wav': true,
     'audio/flac': true,
     'audio/x-flac': true,
-}
+};
 
 /**
  * Decrypt a file attached to a matrix event.

From 5f3b03c85aa512be8575c32b14c0d7d004ba6076 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 26 Oct 2018 23:00:51 -0500
Subject: [PATCH 112/218] Fix a few no-useless-escape lint errors

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/dialogs/CreateGroupDialog.js          | 2 +-
 src/components/views/elements/Pill.js                      | 2 +-
 src/components/views/room_settings/RelatedGroupSettings.js | 2 +-
 src/phonenumber.js                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 6e14d1cf66..882d323449 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -57,7 +57,7 @@ export default React.createClass({
         let error = null;
         if (!this.state.groupId) {
             error = _t("Community IDs cannot be empty.");
-        } else if (!/^[a-z0-9=_\-\.\/]*$/.test(this.state.groupId)) {
+        } else if (!/^[a-z0-9=_\-./]*$/.test(this.state.groupId)) {
             error = _t("Community IDs may only contain characters a-z, 0-9, or '=_-./'");
         }
         this.setState({
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index af7e8c4ae3..0d0949f07c 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -29,7 +29,7 @@ const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
-const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^\/]*)$/;
+const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^/]*)$/;
 
 const Pill = React.createClass({
     statics: {
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index 65132b9b74..4bad5ca806 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -22,7 +22,7 @@ import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import isEqual from 'lodash/isEqual';
 
-const GROUP_ID_REGEX = /\+\S+\:\S+/;
+const GROUP_ID_REGEX = /\+\S+:\S+/;
 
 module.exports = React.createClass({
     displayName: 'RelatedGroupSettings',
diff --git a/src/phonenumber.js b/src/phonenumber.js
index aaf018ba26..3b7e4ba4f1 100644
--- a/src/phonenumber.js
+++ b/src/phonenumber.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const PHONE_NUMBER_REGEXP = /^[0-9 -\.]+$/;
+const PHONE_NUMBER_REGEXP = /^[0-9 -.]+$/;
 
 /*
  * Do basic validation to determine if the given input could be

From e61e7f2626c8ddecb04a8d3a2bb61e5c71709e7b Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 26 Oct 2018 23:03:57 -0500
Subject: [PATCH 113/218] Fix eslint --fix

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/VelocityBounce.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/VelocityBounce.js b/src/VelocityBounce.js
index 732550cfcb..b9513249b8 100644
--- a/src/VelocityBounce.js
+++ b/src/VelocityBounce.js
@@ -4,9 +4,7 @@ const Velocity = require('velocity-vector');
 // We only use easeOutBounce (easeInBounce is just sort of nonsensical)
 function bounce( p ) {
     let pow2;
-
-
-let bounce = 4;
+    let bounce = 4;
 
     while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {
         // just sets pow2

From d54bf13fab8d7dea00f3ae96e8d23cc87a9eaead Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 27 Oct 2018 11:06:52 +0100
Subject: [PATCH 114/218] Hide all the time travel.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_RoleButton.scss | 2 +-
 res/css/views/rooms/_RoomList.scss      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/elements/_RoleButton.scss b/res/css/views/elements/_RoleButton.scss
index 094e0b9b1b..41cd11d7c1 100644
--- a/res/css/views/elements/_RoleButton.scss
+++ b/res/css/views/elements/_RoleButton.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2107 Vector Creations Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 581016d5ba..a346a06a20 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2107 Vector Creations Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 8a3824b9ca89320fde880d5a139275126870e58b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 27 Oct 2018 11:27:43 +0100
Subject: [PATCH 115/218] click-through svg on tag tile context menu to make it
 less weird

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/context_menus/_TagTileContextMenu.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/css/views/context_menus/_TagTileContextMenu.scss b/res/css/views/context_menus/_TagTileContextMenu.scss
index 759b92bd68..799151b198 100644
--- a/res/css/views/context_menus/_TagTileContextMenu.scss
+++ b/res/css/views/context_menus/_TagTileContextMenu.scss
@@ -25,6 +25,10 @@ limitations under the License.
     line-height: 16px;
 }
 
+.mx_TagTileContextMenu_item object {
+    pointer-events: none;
+}
+
 
 .mx_TagTileContextMenu_item_icon {
     padding-right: 8px;

From ac669e824b469906b24198f15004cb9ed427edd6 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkkx@protonmail.com>
Date: Sun, 28 Oct 2018 19:58:21 +0000
Subject: [PATCH 116/218] Translated using Weblate (Polish)

Currently translated at 93.4% (1189 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 9c6f7fba5d..3e5fb0a47e 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -548,8 +548,8 @@
     "code": "kod",
     "quote": "cytat",
     "Create": "Utwórz",
-    "Online": "Dostępny",
-    "Offline": "Niedostępny",
+    "Online": "Dostępny(-a)",
+    "Offline": "Niedostępny(-a)",
     "Add an Integration": "Dodaj integrację",
     "Token incorrect": "Niepoprawny token",
     "To link to a room it must have <a>an address</a>.": "Aby móc stworzyć link do pokoju musi on mieć swój <a>adres</a>.",
@@ -1201,5 +1201,6 @@
     "A phone number is required to register on this homeserver.": "Numer telefonu jest wymagany do rejestracji na tym serwerze domowym.",
     "Updating Riot": "Aktualizowanie Riot",
     "Submit Debug Logs": "Wyślij dzienniki błędów",
-    "Please <a>contact your service administrator</a> to continue using this service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji."
+    "Please <a>contact your service administrator</a> to continue using this service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji.",
+    "Only room administrators will see this warning": "Tylko administratorzy pokojów widzą to ostrzeżenie"
 }

From 8fc8c5e7807c821f5f96160a7866fd5d817f150f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B0=AA=E0=B0=B5=E0=B0=BF?= <pavi@khammam.me>
Date: Sun, 28 Oct 2018 15:14:00 +0000
Subject: [PATCH 117/218] Translated using Weblate (Telugu)

Currently translated at 22.7% (290 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
---
 src/i18n/strings/te.json | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index b6102a5eb5..9dc5221223 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -53,10 +53,10 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s గది పేరు తొలగించబడింది.",
     "Changes to who can read history will only apply to future messages in this room": "చరిత్ర చదివేవారికి మార్పులు ఈ గదిలో భవిష్య సందేశాలకు మాత్రమే వర్తిస్తాయి",
     "Changes your display nickname": "మీ ప్రదర్శన మారుపేరుని మారుస్తుంది",
-    "You cannot place a call with yourself.": "మీరు మీతో కాల్ చేయలేరు.",
+    "You cannot place a call with yourself.": "మీకు మీరే కాల్ చేయలేరు.",
     "You are already in a call.": "మీరు ఇప్పటికే కాల్లో ఉన్నారు.",
     "You are trying to access %(roomName)s.": "మీరు %(roomName)s లను యాక్సెస్ చేయడానికి ప్రయత్నిస్తున్నారు.",
-    "You cannot place VoIP calls in this browser.": "మీరు ఈ బ్రౌజర్లో VoIP కాల్లను ఉంచలేరు.",
+    "You cannot place VoIP calls in this browser.": "మీరు ఈ బ్రౌజర్లో కాల్లను చేయలేరు.",
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "మీరు అన్ని పరికరాల నుండి లాగ్ అవుట్ అయ్యారు మరియు ఇకపై పుష్ ఉండదు.\nప్రకటనలను నోటిఫికేషన్లను పునఃప్రారంభించడానికి, ప్రతి పరికరంలో మళ్లీ సైన్ ఇన్ చేయండి",
     "You have no visible notifications": "మీకు కనిపించే నోటిఫికేషన్లు లేవు",
     "You need to be able to invite users to do that.": "మీరు దీన్ని చేయడానికి వినియోగదారులను ఆహ్వానించగలరు.",
@@ -275,5 +275,26 @@
     "#example": "#ఉదాహరణ",
     "Collapse panel": "ప్యానెల్ కుదించు",
     "Checking for an update...": "నవీకరణ కోసం చూస్తోంది...",
-    "Saturday": "శనివారం"
+    "Saturday": "శనివారం",
+    "This email address is already in use": "ఈ ఇమెయిల్ అడ్రస్ ఇప్పటికే వాడుకం లో ఉంది",
+    "This phone number is already in use": "ఈ ఫోన్ నంబర్ ఇప్పటికే వాడుకం లో ఉంది",
+    "Failed to verify email address: make sure you clicked the link in the email": "ఇమెయిల్ అడ్రస్ ని నిరూపించలేక పోయాము. ఈమెయిల్ లో వచ్చిన లింక్ ని నొక్కారా",
+    "The platform you're on": "మీరు ఉన్న ప్లాట్ఫార్మ్",
+    "The version of Riot.im": "రయట్.ఐఎమ్ యొక్క వెర్సన్",
+    "Your homeserver's URL": "మీ హోమ్ సర్వర్ యొక్క URL",
+    "Your identity server's URL": "మీ ఐడెంటిటి సర్వర్ యొక్క URL",
+    "e.g. %(exampleValue)s": "ఉ.దా. %(exampleValue)s 1",
+    "Every page you use in the app": "ఆప్ లో మీరు వాడే ప్రతి పేజి",
+    "e.g. <CurrentPageURL>": "ఉ.దా. <CurrentPageURL>",
+    "Your User Agent": "మీ యీసర్ ఏజెంట్",
+    "Call Failed": "కాల్ విఫలమయింది",
+    "Review Devices": "పరికరాలని ఒక మారు చూసుకో",
+    "Call": "కాల్",
+    "Answer": "ఎత్తు",
+    "The remote side failed to pick up": "అటు వైపు ఎత్తలేకపోయారు",
+    "Unable to capture screen": "తెరని చూపలేకపోతున్నారు",
+    "Existing Call": "నజుస్తున్న కాల్",
+    "VoIP is unsupported": "కాల్ చేయుట ఈ పరికరం పోషించలేదు",
+    "A conference call could not be started because the intgrations server is not available": "ఇంటిగ్రేషన్ సర్వర్ లేనప్పుడు కాన్ఫరెన్స్ కాల్ మొదలుపెట్టలేరు",
+    "Call in Progress": "నడుస్తున్న కాల్"
 }

From 9933a3cc63a887479176da7e9077cc0949f82bcd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 Oct 2018 17:01:44 +0100
Subject: [PATCH 118/218] Fix autoreplacement of ascii emoji

More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
---
 src/components/views/rooms/MessageComposerInput.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 04f9299825..c92413f052 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -544,7 +544,7 @@ export default class MessageComposerInput extends React.Component {
 
         if (editorState.startText !== null) {
             const text = editorState.startText.text;
-            const currentStartOffset = editorState.startOffset;
+            const currentStartOffset = editorState.selection.start.offset;
 
             // Automatic replacement of plaintext emoji to Unicode emoji
             if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
@@ -558,11 +558,11 @@ export default class MessageComposerInput extends React.Component {
 
                     const range = Range.create({
                         anchor: {
-                            key: editorState.selection.startKey,
+                            key: editorState.startText.key,
                             offset: currentStartOffset - emojiMatch[1].length - 1,
                         },
                         focus: {
-                            key: editorState.selection.startKey,
+                            key: editorState.startText.key,
                             offset: currentStartOffset - 1,
                         },
                     });

From eb22b9141ac3d6f3f6884334cef03fafa8e93f34 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 29 Oct 2018 14:03:19 +0000
Subject: [PATCH 119/218] released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 63f275a609..eb8f88ef22 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.12.1-rc.1",
+    "matrix-js-sdk": "0.12.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 2077678088576fea34b4bd8f007324435b285f65 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 29 Oct 2018 14:06:41 +0000
Subject: [PATCH 120/218] Prepare changelog for v0.14.2

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7e5ca7adf..dae09ee2f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.14.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.2) (2018-10-29)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.2-rc.1...v0.14.2)
+
+ * Fix autoreplacement of ascii emoji
+   [\#2258](https://github.com/matrix-org/matrix-react-sdk/pull/2258)
+
 Changes in [0.14.2-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.2-rc.1) (2018-10-24)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.1...v0.14.2-rc.1)

From c5004ffbe3589756fcc575f35028397c1f4a7000 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 29 Oct 2018 14:07:03 +0000
Subject: [PATCH 121/218] v0.14.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb8f88ef22..7d5af70dc3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.2-rc.1",
+  "version": "0.14.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 76587d4ef8d1b550fa5eaa3a3429b2a43d987c3e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 30 Oct 2018 12:37:44 +0000
Subject: [PATCH 122/218] retest


From 8a0818018729bab18feb010c601f629ece6c86b9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 31 Oct 2018 15:39:45 +0100
Subject: [PATCH 123/218] only run e2e tests on prs targeted on develop

---
 .travis-test-riot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh
index 6cd073a1f8..88b3719b3a 100755
--- a/.travis-test-riot.sh
+++ b/.travis-test-riot.sh
@@ -27,7 +27,7 @@ npm run build
 npm run test
 popd
 
-if [ "$TRAVIS_BRANCH" != "experimental" ]
+if [ "$TRAVIS_BRANCH" = "develop" ]
 then
     # run end to end tests
     git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master

From 23332e16c5b481eea02271d4153c9f322ea61be3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 31 Oct 2018 18:07:29 +0000
Subject: [PATCH 124/218] keyBackupStatus event now has crypto. prefix

---
 src/components/views/settings/KeyBackupPanel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 7cbee9c501..126e4e6712 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -42,14 +42,14 @@ export default class KeyBackupPanel extends React.Component {
     componentWillMount() {
         this._loadBackupStatus();
 
-        MatrixClientPeg.get().on('keyBackupStatus', this._onKeyBackupStatus);
+        MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatus);
     }
 
     componentWillUnmount() {
         this._unmounted = true;
 
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener('keyBackupStatus', this._onKeyBackupStatus);
+            MatrixClientPeg.get().removeListener('crypto.keyBackupStatus', this._onKeyBackupStatus);
         }
     }
 

From 873133458a16a8b51e950cfd0857879e19eba591 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 31 Oct 2018 13:06:57 -0600
Subject: [PATCH 125/218] Remove the request-only stuff we don't need anymore

This was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2250 but can be pulled out due to https://github.com/matrix-org/matrix-js-sdk/pull/770. See https://github.com/vector-im/riot-web/issues/7634 for more information about the future.
---
 karma.conf.js | 13 -------------
 package.json  |  1 -
 2 files changed, 14 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 41ddbdf249..4d699599cb 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -199,25 +199,12 @@ module.exports = function (config) {
 
                     'matrix-react-sdk': path.resolve('test/skinned-sdk.js'),
                     'sinon': 'sinon/pkg/sinon.js',
-
-                    // To make webpack happy
-                    // Related: https://github.com/request/request/issues/1529
-                    // (there's no mock available for fs, so we fake a mock by using
-                    // an in-memory version of fs)
-                    "fs": "memfs",
                 },
                 modules: [
                     path.resolve('./test'),
                     "node_modules"
                 ],
             },
-            node: {
-                // Because webpack is made of fail
-                // https://github.com/request/request/issues/1529
-                // Note: 'mock' is the new 'empty'
-                net: 'mock',
-                tls: 'mock'
-            },
             devtool: 'inline-source-map',
             externals: {
                 // Don't try to bundle electron: leave it as a commonjs dependency
diff --git a/package.json b/package.json
index b72080cd36..8a51c0877d 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,6 @@
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
     "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
-    "memfs": "^2.10.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 1a878fc77a2c3e826ae68fdd81eb34805e97022a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 31 Oct 2018 19:56:34 +0000
Subject: [PATCH 126/218] Quote consistency

---
 src/components/views/settings/KeyBackupPanel.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 126e4e6712..57140456ee 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -80,7 +80,7 @@ export default class KeyBackupPanel extends React.Component {
     }
 
     _startNewBackup() {
-        const CreateKeyBackupDialog = sdk.getComponent("dialogs.keybackup.CreateKeyBackupDialog");
+        const CreateKeyBackupDialog = sdk.getComponent('dialogs.keybackup.CreateKeyBackupDialog');
         Modal.createTrackedDialog('Key Backup', 'Key Backup', CreateKeyBackupDialog, {
             onFinished: () => {
                 this._loadBackupStatus();
@@ -89,9 +89,9 @@ export default class KeyBackupPanel extends React.Component {
     }
 
     _deleteBackup() {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
         Modal.createTrackedDialog('Delete Backup', '', QuestionDialog, {
-            title: _t("Delete Backup"),
+            title: _t('Delete Backup'),
             description: _t(
                 "Delete your backed up encryption keys from the server? " +
                 "You will no longer be able to use your recovery key to read encrypted message history",
@@ -109,7 +109,7 @@ export default class KeyBackupPanel extends React.Component {
     }
 
     _restoreBackup() {
-        const RestoreKeyBackupDialog = sdk.getComponent("dialogs.keybackup.RestoreKeyBackupDialog");
+        const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
         Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {
         });
     }

From 6d6e6b5a4eabfbe6578e1c6fb06ea9d778d53a52 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 31 Oct 2018 20:01:36 +0000
Subject: [PATCH 127/218] Remove cryptic abbreviation

---
 .../views/settings/KeyBackupPanel.js          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 57140456ee..83e78787e5 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -152,7 +152,7 @@ export default class KeyBackupPanel extends React.Component {
             }
 
             let backupSigStatuses = this.state.backupSigStatus.sigs.map((sig, i) => {
-                const sigStatSub = {
+                const sigStatusSubstitutions = {
                     validity: sub =>
                         <span className={sig.valid ? 'mx_KeyBackupPanel_sigValid' : 'mx_KeyBackupPanel_sigInvalid'}>
                             {sub}
@@ -163,35 +163,35 @@ export default class KeyBackupPanel extends React.Component {
                         </span>,
                     device: sub => <span className="mx_KeyBackupPanel_deviceName">{sig.device.getDisplayName()}</span>,
                 };
-                let sigStat;
+                let sigStatus;
                 if (sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key()) {
-                    sigStat = _t(
+                    sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from this device",
-                        {}, sigStatSub,
+                        {}, sigStatusSubstitutions,
                     );
                 } else if (sig.valid && sig.device.isVerified()) {
-                    sigStat = _t(
+                    sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from " +
                         "<verify>verified</verify> device <device>x</device>",
-                        {}, sigStatSub,
+                        {}, sigStatusSubstitutions,
                     );
                 } else if (sig.valid && !sig.device.isVerified()) {
-                    sigStat = _t(
+                    sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from " +
                         "<verify>unverified</verify> device <device></device>",
-                        {}, sigStatSub,
+                        {}, sigStatusSubstitutions,
                     );
                 } else if (!sig.valid && sig.device.isVerified()) {
-                    sigStat = _t(
+                    sigStatus = _t(
                         "Backup has an <validity>invalid</validity> signature from " +
                         "<verify>verified</verify> device <device></device>",
-                        {}, sigStatSub,
+                        {}, sigStatusSubstitutions,
                     );
                 } else if (!sig.valid && !sig.device.isVerified()) {
-                    sigStat = _t(
+                    sigStatus = _t(
                         "Backup has an <validity>invalid</validity> signature from " +
                         "<verify>unverified</verify> device <device></device>",
-                        {}, sigStatSub,
+                        {}, sigStatusSubstitutions,
                     );
                 }
 
@@ -204,7 +204,7 @@ export default class KeyBackupPanel extends React.Component {
                 }
 
                 return <div key={i}>
-                    {sigStat}
+                    {sigStatus}
                     {verifyButton}
                 </div>;
             });

From c6854c0811c5ef5de698672f02aa1475f19317ec Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Thu, 1 Nov 2018 09:29:04 +0000
Subject: [PATCH 128/218] Translated using Weblate (Japanese)

Currently translated at 29.9% (381 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 142 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 141 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 741de4b551..25e18cb11f 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -240,5 +240,145 @@
     "Checking for an update...": "アップデートを確認しています…",
     "There are advanced notifications which are not shown here": "ここに表示されない詳細な通知があります",
     "Call": "通話",
-    "Answer": "応答"
+    "Answer": "応答",
+    "e.g. <CurrentPageURL>": "凡例: <CurrentPageURL>",
+    "Your device resolution": "デバイスの解像度",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "このページに部屋、ユーザー、グループIDなどの識別可能な情報が含まれている場合、そのデータはサーバーに送信される前に削除されます。",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "この部屋には未知の装置があります。確認せずに進むと、誰かがあなたの呼び出しを盗聴する可能性があります。",
+    "Answer Anyway": "とにかく応答",
+    "Call Anyway": "とにかく通話",
+    "Call Timeout": "通話タイムアウト",
+    "The remote side failed to pick up": "相手が応答しなかった",
+    "Unable to capture screen": "画面をキャプチャできません",
+    "Existing Call": "既存の通話",
+    "You are already in a call.": "すでに通話中です。",
+    "VoIP is unsupported": "VoIPはサポートされていません",
+    "You cannot place VoIP calls in this browser.": "このブラウザにはVoIP通話はできません。",
+    "You cannot place a call with yourself.": "自分で電話をかけることはできません。",
+    "Could not connect to the integration server": "統合サーバーに接続できません",
+    "A conference call could not be started because the intgrations server is not available": "統合サーバーが使用できないため、会議通話を開始できませんでした",
+    "Call in Progress": "発信中",
+    "A call is currently being placed!": "現在発信中です！",
+    "A call is already in progress!": "既に発信しています!",
+    "Permission Required": "権限必要",
+    "You do not have permission to start a conference call in this room": "この部屋で電話会議を開始する権限がありません",
+    "The file '%(fileName)s' failed to upload": "'%(fileName)s' ファイルのアップロードに失敗しました",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' ファイルは、このホームサーバーのアップロードのサイズ制限を超えています",
+    "Upload Failed": "アップロードに失敗しました",
+    "Sun": "日",
+    "Mon": "月",
+    "Tue": "火",
+    "Wed": "水",
+    "Thu": "木",
+    "Fri": "金",
+    "Sat": "土",
+    "Jan": "1月",
+    "Feb": "2月",
+    "Mar": "3月",
+    "Apr": "4月",
+    "May": "5月",
+    "Jun": "6月",
+    "Jul": "7月",
+    "Aug": "8月",
+    "Sep": "9月",
+    "Oct": "10月",
+    "Nov": "11月",
+    "Dec": "12月",
+    "PM": "午後",
+    "AM": "午前",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s日 %(weekDayName)s曜日 %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s年 %(monthName)s %(day)s日 (%(weekDayName)s)",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s年 %(monthName)s %(day)s日 %(weekDayName)s曜日 %(time)s",
+    "Who would you like to add to this community?": "このコミュニティに誰を追加しますか？",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：あなたがコミュニティに追加する人は誰でも、コミュニティIDを知っている人には公開されます",
+    "Invite new community members": "新しいコミュニティメンバーを招待する",
+    "Name or matrix ID": "名前または matrix ID",
+    "Invite to Community": "コミュニティに招待",
+    "Which rooms would you like to add to this community?": "このコミュニティに追加したい部屋はどれですか？",
+    "Show these rooms to non-members on the community page and room list?": "コミュニティページとルームリストのメンバー以外にこれらの部屋を公開しますか？",
+    "Add rooms to the community": "コミュニティに部屋を追加します",
+    "Room name or alias": "部屋名またはエイリアス",
+    "Add to community": "コミュニティに追加",
+    "Failed to invite the following users to %(groupId)s:": "次のユーザーを ％(groupId)s に招待できませんでした:",
+    "Failed to invite users to community": "ユーザーをコミュニティに招待できませんでした",
+    "Failed to invite users to %(groupId)s": "ユーザーを %(groupId)s に招待できませんでした",
+    "Failed to add the following rooms to %(groupId)s:": "次の部屋を ％(groupId)s に追加できませんでした:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riotに通知を送信する権限がありません - ブラウザの設定を確認してください",
+    "Riot was not given permission to send notifications - please try again": "Riotに通知を送信する権限がありませんでした。もう一度お試しください",
+    "Unable to enable Notifications": "通知を有効にできません",
+    "This email address was not found": "このメールアドレスが見つかりませんでした",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "あなたのメールアドレスは、このホームサーバー上のマトリックスIDと関連付けられていないようです。",
+    "Registration Required": "登録が必要です",
+    "You need to register to do this. Would you like to register now?": "これを行うには登録する必要があります。 今すぐ登録しますか？",
+    "Default": "既定値",
+    "Restricted": "制限",
+    "Moderator": "仲裁者",
+    "Admin": "管理者",
+    "Start a chat": "チャットを開始する",
+    "Who would you like to communicate with?": "誰と通信しますか?",
+    "Email, name or matrix ID": "メールアドレス、名前、またはマトリックスID",
+    "Invite new room members": "新しい部屋のメンバーを招待します",
+    "Who would you like to add to this room?": "誰をこの部屋に追加しますか？",
+    "Send Invites": "招待状を送る",
+    "Failed to invite user": "ユーザーを招待できませんでした",
+    "Failed to invite": "招待できませんでした",
+    "Failed to invite the following users to the %(roomName)s room:": "次のユーザーを ％(roomName)s の部屋に招待できませんでした:",
+    "You need to be logged in.": "ログインする必要があります。",
+    "You need to be able to invite users to do that.": "それをするためにユーザーを招待できる必要があります。",
+    "Unable to create widget.": "ウィジェットを作成できません。",
+    "Missing roomId.": "roomIdがありません。",
+    "Failed to send request.": "リクエストの送信に失敗しました。",
+    "This room is not recognised.": "この部屋は認識されません。",
+    "Power level must be positive integer.": "権限レベルは正の整数でなければなりません。",
+    "You are not in this room.": "この部屋のメンバーではありません。",
+    "You do not have permission to do that in this room.": "あなたはこの部屋でそれを行う許可を持っていません。",
+    "Missing room_id in request": "リクエストにroom_idがありません",
+    "Room %(roomId)s not visible": "部屋 %(roomId)s は見えません",
+    "Missing user_id in request": "リクエストにuser_idがありません",
+    "Usage": "用法",
+    "Searches DuckDuckGo for results": "DuckDuckGoを検索します",
+    "/ddg is not a command": "/ddg はコマンドではありません",
+    "To use it, just wait for autocomplete results to load and tab through them.": "それを使用するには、結果が完全にロードされるのを待ってから、Tabキーを押してください。",
+    "Changes your display nickname": "表示されるニックネームを変更",
+    "Changes colour scheme of current room": "現在の部屋のスキームを変更する",
+    "Sets the room topic": "部屋のトピックを設定",
+    "Invites user with given id to current room": "指定されたIDを持つユーザーを現在のルームに招待する",
+    "Joins room with given alias": "指定された別名で部屋に参加する",
+    "Leave room": "部屋を出る",
+    "Unrecognised room alias:": "認識されない部屋の別名:",
+    "Kicks user with given id": "与えられたIDを持つユーザーを追い出す",
+    "Bans user with given id": "指定されたIDでユーザーを禁止する",
+    "Unbans user with given id": "指定されたIDでユーザーのブロックを解除する",
+    "Ignores a user, hiding their messages from you": "ユーザーを無視し、自分からのメッセージを隠す",
+    "Ignored user": "無視されたユーザー",
+    "You are now ignoring %(userId)s": "%(userId)s を無視しています",
+    "Stops ignoring a user, showing their messages going forward": "ユーザー無視を止めてメッセージを表示する",
+    "Unignored user": "無記名ユーザー",
+    "You are no longer ignoring %(userId)s": "あなたはもはや %(userId)s を無視していません",
+    "Define the power level of a user": "ユーザーの権限レベルを定義",
+    "Deops user with given id": "指定されたIDのユーザーを非表示",
+    "Opens the Developer Tools dialog": "開発者ツールダイアログを開きます",
+    "Verifies a user, device, and pubkey tuple": "ユーザー、デバイス、および公開鍵タプルを検証します",
+    "Unknown (user, device) pair:": "不明な(ユーザー、デバイス) ペア:",
+    "Device already verified!": "デバイスはすでに確認済みです！",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "警告：デバイスはすでに検証済みですが、キーは一致しません！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告: キー確認が失敗しました! %(userId)s とデバイス ％(deviceId)s の署名鍵は、提供された鍵 \"％(fingerprint)s\" と一致しない \"%(fprint)s\" です。 通信が傍受されている可能性があります!",
+    "Verified key": "確認済みのキー",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "指定した署名鍵は、％(userId)s のデバイス％(deviceId)s から受け取った署名鍵と一致します。デバイスを検証済みとしてマークしました。",
+    "Displays action": "アクションを表示",
+    "Forces the current outbound group session in an encrypted room to be discarded": "暗号化されたルーム内の現在のアウトバウンドグループセッションを強制的に破棄します",
+    "Unrecognised command:": "認識できないコマンド:",
+    "Reason": "理由",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s は %(displayName)s の招待を受け入れました。",
+    "%(targetName)s accepted an invitation.": "%(targetName)s は招待を受け入れました。",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s はVoIP会議を要求しました。",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s は %(targetName)s を招待しました。",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s は %(targetName)s を追放しました。",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s は、表示名を %(displayName)s に変更しました。",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s は、表示名を %(displayName)s に設定します。",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s は表示名 (%(oldDisplayName)s) を削除しました。",
+    "%(senderName)s removed their profile picture.": "%(senderName)s はプロフィール画像を削除しました。",
+    "%(senderName)s changed their profile picture.": "%(senderName)s はプロフィール画像を変更しました。",
+    "%(senderName)s set a profile picture.": "%(senderName)s はプロフィール画像を設定しました。"
 }

From 4fbfc7cb4dfd0f0953e45d1c9d561a681cb2385e Mon Sep 17 00:00:00 2001
From: Moo <hazap@hotmail.com>
Date: Wed, 31 Oct 2018 20:27:32 +0000
Subject: [PATCH 129/218] Translated using Weblate (Lithuanian)

Currently translated at 69.3% (882 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
---
 src/i18n/strings/lt.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 776445e40d..1f8963babb 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -872,5 +872,16 @@
     "You have no historical rooms": "Jūs neturite istorinių kambarių",
     "Historical": "Istoriniai",
     "Every page you use in the app": "Kiekvienas puslapis, kurį naudoji programoje",
-    "Call Timeout": "Skambučio laikas baigėsi"
+    "Call Timeout": "Skambučio laikas baigėsi",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s kaip šio kambario adresus pridėjo %(addedAddresses)s.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s kaip šio kambario adresą pridėjo %(addedAddresses)s.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s kaip šio kambario adresus pašalino %(removedAddresses)s.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s kaip šio kambario adresą pašalino %(removedAddresses)s.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s kaip šio kambario adresus pridėjo %(addedAddresses)s ir pašalino %(removedAddresses)s.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s nustatė pagrindinį šio kambario adresą į %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s pašalino pagrindinį šio kambario adresą.",
+    "Disinvite": "Atšaukti pakvietimą",
+    "Disinvite this user?": "Atšaukti pakvietimą šiam naudotojui?",
+    "Unknown for %(duration)s": "Nežinoma jau %(duration)s",
+    "(warning: cannot be disabled again!)": "(įspėjimas: nebeįmanoma bus išjungti!)"
 }

From 2589ce6a775c11d32c3c9bb5c80c25b91261299a Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkkx@protonmail.com>
Date: Wed, 31 Oct 2018 17:50:05 +0000
Subject: [PATCH 130/218] Translated using Weblate (Polish)

Currently translated at 93.8% (1194 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 3e5fb0a47e..53bbfcd496 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1202,5 +1202,10 @@
     "Updating Riot": "Aktualizowanie Riot",
     "Submit Debug Logs": "Wyślij dzienniki błędów",
     "Please <a>contact your service administrator</a> to continue using this service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji.",
-    "Only room administrators will see this warning": "Tylko administratorzy pokojów widzą to ostrzeżenie"
+    "Only room administrators will see this warning": "Tylko administratorzy pokojów widzą to ostrzeżenie",
+    "Open Devtools": "Otwórz narzędzia deweloperskie",
+    "Clear cache and resync": "Wyczyść pamięć podręczną i zsynchronizuj ponownie",
+    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot używa teraz 3-5x mniej pamięci, ładując informacje o innych użytkownikach tylko wtedy, gdy jest to konieczne. Poczekaj, aż ponownie zsynchronizujemy się z serwerem!",
+    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Jeśli inna wersja Riot jest nadal otwarta w innej zakładce, proszę zamknij ją, ponieważ używanie Riot na tym samym komputerze z włączonym i wyłączonym jednocześnie leniwym ładowaniem będzie powodować problemy.",
+    "And %(count)s more...|other": "I %(count)s więcej…"
 }

From 5558b7a3b2b8d8beec94cd901712e3f778cfa6e6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 1 Nov 2018 14:43:15 -0600
Subject: [PATCH 131/218] Avoid hitting the SettingsStore thousands of times
 when generating room lists

Should fix https://github.com/vector-im/riot-web/issues/7646 to some degree
---
 src/stores/RoomListStore.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 8909dbb489..527fc0fe2e 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -217,11 +217,16 @@ class RoomListStore extends Store {
             }
         });
 
+        // Note: we check the settings up here instead of in the forEach or
+        // in the _recentsComparator to avoid hitting the SettingsStore a few
+        // thousand times.
+        const pinUnread = SettingsStore.getValue("pinUnreadRooms");
+        const pinMentioned = SettingsStore.getValue("pinMentionedRooms");
         Object.keys(lists).forEach((listKey) => {
             let comparator;
             switch (RoomListStore._listOrders[listKey]) {
                 case "recent":
-                    comparator = this._recentsComparator;
+                    comparator = (roomA, roomB) => this._recentsComparator(roomA, roomB, pinUnread, pinMentioned);
                     break;
                 case "manual":
                 default:
@@ -262,10 +267,7 @@ class RoomListStore extends Store {
         }
     }
 
-    _recentsComparator(roomA, roomB) {
-        const pinUnread = SettingsStore.getValue("pinUnreadRooms");
-        const pinMentioned = SettingsStore.getValue("pinMentionedRooms");
-
+    _recentsComparator(roomA, roomB, pinUnread, pinMentioned) {
         // We try and set the ordering to be Mentioned > Unread > Recent
         // assuming the user has the right settings, of course
 

From 272acfa2f55b89f87658da91a503a2023ef83958 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 1 Nov 2018 14:46:39 -0600
Subject: [PATCH 132/218] Appease the linter

---
 src/stores/RoomListStore.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 527fc0fe2e..65148ec8c4 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -226,7 +226,9 @@ class RoomListStore extends Store {
             let comparator;
             switch (RoomListStore._listOrders[listKey]) {
                 case "recent":
-                    comparator = (roomA, roomB) => this._recentsComparator(roomA, roomB, pinUnread, pinMentioned);
+                    comparator = (roomA, roomB) => {
+                        return this._recentsComparator(roomA, roomB, pinUnread, pinMentioned);
+                    };
                     break;
                 case "manual":
                 default:

From 0c7aadb92b0d3b7042ff8658c33df5b0b697cefe Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 1 Nov 2018 16:28:13 -0600
Subject: [PATCH 133/218] Improve room list sort performance by caching common
 variables

This won't help much if the user is in a ton of highly active rooms, but for the most part this will help those in thousands of rooms, many of which are likely to be quiet.

Fixes https://github.com/vector-im/riot-web/issues/7646
Fixes https://github.com/vector-im/riot-web/issues/7645 (due to timestamp ordering)
---
 src/stores/RoomListStore.js | 135 ++++++++++++++++++++++++++++++++----
 1 file changed, 120 insertions(+), 15 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 65148ec8c4..e77debd2f2 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -54,6 +54,7 @@ class RoomListStore extends Store {
                 "im.vector.fake.archived": [],
             },
             ready: false,
+            roomCache: {}, // roomId => { cacheType => value }
         };
     }
 
@@ -85,6 +86,8 @@ class RoomListStore extends Store {
                     !payload.isLiveUnfilteredRoomTimelineEvent ||
                     !this._eventTriggersRecentReorder(payload.event)
                 ) break;
+
+                this._clearCachedRoomState(payload.event.getRoomId());
                 this._generateRoomLists();
             }
             break;
@@ -112,6 +115,8 @@ class RoomListStore extends Store {
                 if (liveTimeline !== eventTimeline ||
                     !this._eventTriggersRecentReorder(payload.event)
                 ) break;
+
+                this._clearCachedRoomState(payload.event.getRoomId());
                 this._generateRoomLists();
             }
             break;
@@ -222,12 +227,20 @@ class RoomListStore extends Store {
         // thousand times.
         const pinUnread = SettingsStore.getValue("pinUnreadRooms");
         const pinMentioned = SettingsStore.getValue("pinMentionedRooms");
+        this._timings = {};
         Object.keys(lists).forEach((listKey) => {
             let comparator;
             switch (RoomListStore._listOrders[listKey]) {
                 case "recent":
                     comparator = (roomA, roomB) => {
-                        return this._recentsComparator(roomA, roomB, pinUnread, pinMentioned);
+                        this._timings["overall_" + roomA.roomId + "_" + roomB.roomId] = {
+                            type: "overall",
+                            start: performance.now(),
+                            end: 0,
+                        };
+                        const ret = this._recentsComparator(roomA, roomB, pinUnread, pinMentioned);
+                        this._timings["overall_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
+                        return ret;
                     };
                     break;
                 case "manual":
@@ -238,12 +251,76 @@ class RoomListStore extends Store {
             lists[listKey].sort(comparator);
         });
 
+        // Combine the samples for performance metrics
+        const samplesByType = {};
+        for (const sampleName of Object.keys(this._timings)) {
+            const sample = this._timings[sampleName];
+            if (!samplesByType[sample.type]) samplesByType[sample.type] = {
+                min: 999999999,
+                max: 0,
+                count: 0,
+                total: 0,
+            };
+
+            const record = samplesByType[sample.type];
+            const duration = sample.end - sample.start;
+            if (duration < record.min) record.min = duration;
+            if (duration > record.max) record.max = duration;
+            record.count++;
+            record.total += duration;
+        }
+
+        for (const category of Object.keys(samplesByType)) {
+            const {min, max, count, total} = samplesByType[category];
+            const average = total / count;
+
+            console.log(`RoomListSortPerf : type=${category} min=${min} max=${max} total=${total} samples=${count} average=${average}`);
+        }
+
         this._setState({
             lists,
             ready: true, // Ready to receive updates via Room.tags events
         });
     }
 
+    _updateCachedRoomState(roomId, type, value) {
+        const roomCache = this._state.roomCache;
+        if (!roomCache[roomId]) roomCache[roomId] = {};
+
+        if (value) roomCache[roomId][type] = value;
+        else delete roomCache[roomId][type];
+
+        this._setState({roomCache});
+    }
+
+    _clearCachedRoomState(roomId) {
+        const roomCache = this._state.roomCache;
+        delete roomCache[roomId];
+        this._setState({roomCache});
+    }
+
+    _getRoomState(room, type) {
+        const roomId = room.roomId;
+        const roomCache = this._state.roomCache;
+        if (roomCache[roomId] && typeof roomCache[roomId][type] !== 'undefined') {
+            return roomCache[roomId][type];
+        }
+
+        if (type === "timestamp") {
+            const ts = this._tsOfNewestEvent(room);
+            this._updateCachedRoomState(roomId, "timestamp", ts);
+            return ts;
+        } else if (type === "unread") {
+            const unread = room.getUnreadNotificationCount() > 0;
+            this._updateCachedRoomState(roomId, "unread", unread);
+            return unread;
+        } else if (type === "notifications") {
+            const notifs = room.getUnreadNotificationCount("highlight") > 0;
+            this._updateCachedRoomState(roomId, "notifications", notifs);
+            return notifs;
+        } else throw new Error("Unrecognized room cache type: " + type);
+    }
+
     _eventTriggersRecentReorder(ev) {
         return ev.getTs() && (
             Unread.eventTriggersUnreadCount(ev) ||
@@ -270,30 +347,58 @@ class RoomListStore extends Store {
     }
 
     _recentsComparator(roomA, roomB, pinUnread, pinMentioned) {
+        //console.log("Comparing " + roomA.roomId + " with " + roomB.roomId +" || pinUnread=" + pinUnread +" pinMentioned="+pinMentioned);
         // We try and set the ordering to be Mentioned > Unread > Recent
-        // assuming the user has the right settings, of course
+        // assuming the user has the right settings, of course.
+
+        this._timings["timestamp_" + roomA.roomId + "_" + roomB.roomId] = {
+            type: "timestamp",
+            start: performance.now(),
+            end: 0,
+        };
+        const timestampA = this._getRoomState(roomA, "timestamp");
+        const timestampB = this._getRoomState(roomB, "timestamp");
+        const timestampDiff = timestampB - timestampA;
+        this._timings["timestamp_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
 
         if (pinMentioned) {
-             const mentionsA = roomA.getUnreadNotificationCount("highlight") > 0;
-             const mentionsB = roomB.getUnreadNotificationCount("highlight") > 0;
-             if (mentionsA && !mentionsB) return -1;
-             if (!mentionsA && mentionsB) return 1;
-             if (mentionsA && mentionsB) return 0;
-             // If neither have mentions, fall through to remaining checks
+            this._timings["mentioned_" + roomA.roomId + "_" + roomB.roomId] = {
+                type: "mentioned",
+                start: performance.now(),
+                end: 0,
+            };
+            const mentionsA = this._getRoomState(roomA, "notifications");
+            const mentionsB = this._getRoomState(roomB, "notifications");
+            this._timings["mentioned_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
+            if (mentionsA && !mentionsB) return -1;
+            if (!mentionsA && mentionsB) return 1;
+
+            // If they both have notifications, sort by timestamp.
+            // If neither have notifications (the fourth check not shown
+            // here), then try and sort by unread messages and finally by
+            // timestamp.
+            if (mentionsA && mentionsB) return timestampDiff;
         }
 
         if (pinUnread) {
-            const unreadA = Unread.doesRoomHaveUnreadMessages(roomA);
-            const unreadB = Unread.doesRoomHaveUnreadMessages(roomB);
+            this._timings["unread_" + roomA.roomId + "_" + roomB.roomId] = {
+                type: "unread",
+                start: performance.now(),
+                end: 0,
+            };
+            const unreadA = this._getRoomState(roomA, "unread");
+            const unreadB = this._getRoomState(roomB, "notifications");
+            this._timings["unread_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
             if (unreadA && !unreadB) return -1;
             if (!unreadA && unreadB) return 1;
-            if (unreadA && unreadB) return 0;
-            // If neither have unread messages, fall through to remaining checks
+
+            // If they both have unread messages, sort by timestamp
+            // If nether have unread message (the fourth check not shown
+            // here), then just sort by timestamp anyways.
+            if (unreadA && unreadB) return timestampDiff;
         }
 
-        // XXX: We could use a cache here and update it when we see new
-        // events that trigger a reorder
-        return this._tsOfNewestEvent(roomB) - this._tsOfNewestEvent(roomA);
+        return timestampDiff;
     }
 
     _lexicographicalComparator(roomA, roomB) {

From 122868e32f3c27b1565c1044b3c325b96c5a0b54 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 1 Nov 2018 16:30:48 -0600
Subject: [PATCH 134/218] Removing timing/performance tracking on room list
 store

This was used to verify the fix was actually making improvements and can be safely taken out.
---
 src/stores/RoomListStore.js | 55 +------------------------------------
 1 file changed, 1 insertion(+), 54 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index e77debd2f2..8dc557ace0 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -227,20 +227,12 @@ class RoomListStore extends Store {
         // thousand times.
         const pinUnread = SettingsStore.getValue("pinUnreadRooms");
         const pinMentioned = SettingsStore.getValue("pinMentionedRooms");
-        this._timings = {};
         Object.keys(lists).forEach((listKey) => {
             let comparator;
             switch (RoomListStore._listOrders[listKey]) {
                 case "recent":
                     comparator = (roomA, roomB) => {
-                        this._timings["overall_" + roomA.roomId + "_" + roomB.roomId] = {
-                            type: "overall",
-                            start: performance.now(),
-                            end: 0,
-                        };
-                        const ret = this._recentsComparator(roomA, roomB, pinUnread, pinMentioned);
-                        this._timings["overall_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
-                        return ret;
+                        return this._recentsComparator(roomA, roomB, pinUnread, pinMentioned);
                     };
                     break;
                 case "manual":
@@ -251,32 +243,6 @@ class RoomListStore extends Store {
             lists[listKey].sort(comparator);
         });
 
-        // Combine the samples for performance metrics
-        const samplesByType = {};
-        for (const sampleName of Object.keys(this._timings)) {
-            const sample = this._timings[sampleName];
-            if (!samplesByType[sample.type]) samplesByType[sample.type] = {
-                min: 999999999,
-                max: 0,
-                count: 0,
-                total: 0,
-            };
-
-            const record = samplesByType[sample.type];
-            const duration = sample.end - sample.start;
-            if (duration < record.min) record.min = duration;
-            if (duration > record.max) record.max = duration;
-            record.count++;
-            record.total += duration;
-        }
-
-        for (const category of Object.keys(samplesByType)) {
-            const {min, max, count, total} = samplesByType[category];
-            const average = total / count;
-
-            console.log(`RoomListSortPerf : type=${category} min=${min} max=${max} total=${total} samples=${count} average=${average}`);
-        }
-
         this._setState({
             lists,
             ready: true, // Ready to receive updates via Room.tags events
@@ -347,29 +313,16 @@ class RoomListStore extends Store {
     }
 
     _recentsComparator(roomA, roomB, pinUnread, pinMentioned) {
-        //console.log("Comparing " + roomA.roomId + " with " + roomB.roomId +" || pinUnread=" + pinUnread +" pinMentioned="+pinMentioned);
         // We try and set the ordering to be Mentioned > Unread > Recent
         // assuming the user has the right settings, of course.
 
-        this._timings["timestamp_" + roomA.roomId + "_" + roomB.roomId] = {
-            type: "timestamp",
-            start: performance.now(),
-            end: 0,
-        };
         const timestampA = this._getRoomState(roomA, "timestamp");
         const timestampB = this._getRoomState(roomB, "timestamp");
         const timestampDiff = timestampB - timestampA;
-        this._timings["timestamp_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
 
         if (pinMentioned) {
-            this._timings["mentioned_" + roomA.roomId + "_" + roomB.roomId] = {
-                type: "mentioned",
-                start: performance.now(),
-                end: 0,
-            };
             const mentionsA = this._getRoomState(roomA, "notifications");
             const mentionsB = this._getRoomState(roomB, "notifications");
-            this._timings["mentioned_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
             if (mentionsA && !mentionsB) return -1;
             if (!mentionsA && mentionsB) return 1;
 
@@ -381,14 +334,8 @@ class RoomListStore extends Store {
         }
 
         if (pinUnread) {
-            this._timings["unread_" + roomA.roomId + "_" + roomB.roomId] = {
-                type: "unread",
-                start: performance.now(),
-                end: 0,
-            };
             const unreadA = this._getRoomState(roomA, "unread");
             const unreadB = this._getRoomState(roomB, "notifications");
-            this._timings["unread_" + roomA.roomId + "_" + roomB.roomId].end = performance.now();
             if (unreadA && !unreadB) return -1;
             if (!unreadA && unreadB) return 1;
 

From a713cc5c52309f74d1dfccef28556de037eb3db1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 1 Nov 2018 17:07:05 -0600
Subject: [PATCH 135/218] Compare the right types of events

---
 src/stores/RoomListStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 8dc557ace0..f7596774b6 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -335,7 +335,7 @@ class RoomListStore extends Store {
 
         if (pinUnread) {
             const unreadA = this._getRoomState(roomA, "unread");
-            const unreadB = this._getRoomState(roomB, "notifications");
+            const unreadB = this._getRoomState(roomB, "unread");
             if (unreadA && !unreadB) return -1;
             if (!unreadA && unreadB) return 1;
 

From 3960ae2fcd956702c5adc4f0929438acdea53388 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 1 Nov 2018 17:17:01 -0600
Subject: [PATCH 136/218] Add more commentary around how the roomCache works

---
 src/stores/RoomListStore.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index f7596774b6..2b70d53b59 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -54,7 +54,24 @@ class RoomListStore extends Store {
                 "im.vector.fake.archived": [],
             },
             ready: false,
-            roomCache: {}, // roomId => { cacheType => value }
+
+            // The room cache stores a mapping of roomId to cache record.
+            // Each cache record is a key/value pair for various bits of
+            // data used to sort the room list. Currently this stores the
+            // following bits of informations:
+            //   "timestamp":     number, The timestamp of the last relevant
+            //                    event in the room.
+            //   "notifications": boolean, Whether or not the user has been
+            //                    highlighted on any unread events.
+            //   "unread":        boolean, Whether or not the user has any
+            //                    unread events.
+            //
+            // All of the cached values are lazily loaded on read in the
+            // recents comparator. When an event is received for a particular
+            // room, all the cached values are invalidated - forcing the
+            // next read to set new values. The entries do not expire on
+            // their own.
+            roomCache: {},
         };
     }
 

From 6c908a3e08eed07c71f9bac66102ec20a631ac0a Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Fri, 2 Nov 2018 00:20:32 +0000
Subject: [PATCH 137/218] Translated using Weblate (Japanese)

Currently translated at 34.3% (437 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 58 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 25e18cb11f..95fe39d76c 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -380,5 +380,61 @@
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s は表示名 (%(oldDisplayName)s) を削除しました。",
     "%(senderName)s removed their profile picture.": "%(senderName)s はプロフィール画像を削除しました。",
     "%(senderName)s changed their profile picture.": "%(senderName)s はプロフィール画像を変更しました。",
-    "%(senderName)s set a profile picture.": "%(senderName)s はプロフィール画像を設定しました。"
+    "%(senderName)s set a profile picture.": "%(senderName)s はプロフィール画像を設定しました。",
+    "VoIP conference started.": "VoIP会議が開始されました。",
+    "VoIP conference finished.": "VoIP会議が終了しました。",
+    "%(targetName)s rejected the invitation.": "%(targetName)s は招待を拒否しました。",
+    "%(targetName)s left the room.": "%(targetName)s は部屋を出ました。",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s は %(targetName)s のブロックを解除しました。",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s は %(targetName)s を追放しました。",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s は %(targetName)s の招待を撤回しました。",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s はトピックを \"%(topic)s\" に変更しました。",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s はルーム名を削除しました。",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s はルーム名を %(roomName)s に変更しました。",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s はイメージを送信しました。",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s はこの部屋のアドレスとして %(addedAddresses)s を追加しました。",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s はこの部屋のアドレスとして %(addedAddresses)s を追加しました。",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s はこの部屋のアドレスとして %(removedAddresses)s を削除しました。",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s はこの部屋のアドレスとして %(removedAddresses)s を削除しました。",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s はこの部屋のアドレスとして %(addedAddresses)s を追加し、%(removedAddresses)s を削除しました。",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s は、この部屋のメインアドレスを %(address)s に設定しました。",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s はこの部屋のメインアドレスを削除しました。",
+    "Someone": "誰か",
+    "(not supported by this browser)": "(このブラウザではサポートされていません)",
+    "%(senderName)s answered the call.": "%(senderName)s が応答しました。",
+    "(could not connect media)": "(メディアを接続できませんでした)",
+    "(no answer)": "(応答なし)",
+    "(unknown failure: %(reason)s)": "(不明なエラー: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s は通話を終了しました。",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s は %(callType)s 電話をかけました。",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s は部屋に加わるよう %(targetDisplayName)s に招待状を送りました。",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s は、すべてのルームメンバーに招待された時点からの部屋履歴を参照できるようにしました。",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s は、すべての部屋のメンバーに参加した時点からの部屋履歴を参照できるようにしました。",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s は、すべての部屋メンバーに部屋履歴を参照できるようにしました。",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s は、部屋履歴を誰でも参照できるようにしました。",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s は 見知らぬ (%(visibility)s) に部屋履歴を参照できるようにしました。",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s はエンドツーエンドの暗号化をオンにしました (アルゴリズム %(algorithm)s)。",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s は %(fromPowerLevel)s から %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s は %(powerLevelDiffText)s の権限レベルを変更しました。",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s は、その部屋の固定メッセージを変更しました。",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s ウィジェットは %(senderName)s によって変更されました",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s ウィジェットが %(senderName)s によって追加されました",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s ウィジェットが %(senderName)s によって削除されました",
+    "%(names)s and %(count)s others are typing|other": "%(names)s と 他 %(count)s 人が入力中です",
+    "%(names)s and %(count)s others are typing|one": "%(names)s ともう1人が入力中です",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s と %(lastPerson)s が入力しています",
+    "Failure to create room": "部屋の作成に失敗しました",
+    "Server may be unavailable, overloaded, or you hit a bug.": "サーバーが使用できない、オーバーロードされている、またはバグが発生した可能性があります。",
+    "Send anyway": "とにかく送る",
+    "Unnamed Room": "名前のない部屋",
+    "This homeserver has hit its Monthly Active User limit.": "このホームサーバーは、月間アクティブユーザー制限を超えています。",
+    "This homeserver has exceeded one of its resource limits.": "このホームサーバーは、リソース制限の1つを超えています。",
+    "Please <a>contact your service administrator</a> to continue using the service.": "サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
+    "Unable to connect to Homeserver. Retrying...": "ホームサーバーに接続できません。 再試行中...",
+    "Your browser does not support the required cryptography extensions": "お使いのブラウザは、必要な暗号化拡張機能をサポートしていません",
+    "Not a valid Riot keyfile": "有効なRiotキーファイルではありません",
+    "Authentication check failed: incorrect password?": "認証チェックに失敗しました: パスワードの間違い?",
+    "Sorry, your homeserver is too old to participate in this room.": "申し訳ありませんが、あなたのホームサーバーはこの部屋に参加するには古すぎます。",
+    "Please contact your homeserver administrator.": "ホームサーバー管理者に連絡してください。",
+    "Failed to join room": "部屋に参加できませんでした"
 }

From f7bc27413dd3574a079bed84366acc8d485cd822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 2 Nov 2018 09:00:00 +0000
Subject: [PATCH 138/218] Translated using Weblate (French)

Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 1a936270e6..9958e51d16 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1298,5 +1298,7 @@
     "Joining room...": "Adhésion au salon…",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vous êtes administrateur de cette communauté. Vous ne pourrez pas revenir sans une invitation d'un autre administrateur.",
     "Open Devtools": "Ouvrir les outils développeur",
-    "Show developer tools": "Afficher les outils de développeur"
+    "Show developer tools": "Afficher les outils de développeur",
+    "Pin unread rooms to the top of the room list": "Épingler les salons non lus en haut de la liste des salons",
+    "Pin rooms I'm mentioned in to the top of the room list": "Épingler les salons où l'on me mentionne en haut de la liste des salons"
 }

From 1ba96b97ea96d5a6340aeb5d8e5e00faf7b0fe6e Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 2 Nov 2018 12:06:16 +0000
Subject: [PATCH 139/218] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index ce1cb211f3..b777817c0a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1298,5 +1298,7 @@
     "Joining room...": "Belépés a szobába..",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Te vagy ennek a közösségnek az adminisztrátora. Egy másik adminisztrátortól kapott meghívó nélkül nem tudsz majd újra csatlakozni.",
     "Open Devtools": "Fejlesztői eszközök megnyitása",
-    "Show developer tools": "Fejlesztői eszközök megjelenítése"
+    "Show developer tools": "Fejlesztői eszközök megjelenítése",
+    "Pin unread rooms to the top of the room list": "Nem olvasott üzeneteket tartalmazó szobák a szobalista elejére",
+    "Pin rooms I'm mentioned in to the top of the room list": "Megemlítéseket tartalmazó szobák a szobalista elejére"
 }

From ade9c7002a3e149fe57e19d4e6c2552e961cc608 Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Fri, 2 Nov 2018 09:16:31 +0000
Subject: [PATCH 140/218] Translated using Weblate (Japanese)

Currently translated at 57.4% (732 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 326 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 311 insertions(+), 15 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 95fe39d76c..e188d821ad 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -14,7 +14,7 @@
     "Encryption is enabled in this room": "この部屋の発言は暗号化されています",
     "Favourite": "お気に入り",
     "Favourites": "お気に入り",
-    "Hide read receipts": "発言を読んでも既読状態にしない",
+    "Hide read receipts": "既読を表示しない",
     "Invited": "招待中",
     "%(displayName)s is typing": "%(displayName)s 文字入力中",
     "%(targetName)s joined the room.": "%(targetName)s 部屋に参加しました。",
@@ -125,7 +125,7 @@
     "Leave": "退室",
     "Enable notifications for this account": "このアカウントで通知を行う",
     "Failed to update keywords": "キーワードの更新に失敗しました",
-    "Enable email notifications": "電子メールでの通知を行う",
+    "Enable email notifications": "電子メール通知を有効にする",
     "Directory": "部屋一覧",
     "Download this file": "この添付ファイルをダウンロード",
     "Failed to get public room list": "公開部屋一覧の取得に失敗しました",
@@ -242,9 +242,9 @@
     "Call": "通話",
     "Answer": "応答",
     "e.g. <CurrentPageURL>": "凡例: <CurrentPageURL>",
-    "Your device resolution": "デバイスの解像度",
+    "Your device resolution": "端末の解像度",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "このページに部屋、ユーザー、グループIDなどの識別可能な情報が含まれている場合、そのデータはサーバーに送信される前に削除されます。",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "この部屋には未知の装置があります。確認せずに進むと、誰かがあなたの呼び出しを盗聴する可能性があります。",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "この部屋には未知の端末があります。確認せずに進むと、誰かがあなたの呼び出しを盗聴する可能性があります。",
     "Answer Anyway": "とにかく応答",
     "Call Anyway": "とにかく通話",
     "Call Timeout": "通話タイムアウト",
@@ -359,13 +359,13 @@
     "Define the power level of a user": "ユーザーの権限レベルを定義",
     "Deops user with given id": "指定されたIDのユーザーを非表示",
     "Opens the Developer Tools dialog": "開発者ツールダイアログを開きます",
-    "Verifies a user, device, and pubkey tuple": "ユーザー、デバイス、および公開鍵タプルを検証します",
-    "Unknown (user, device) pair:": "不明な(ユーザー、デバイス) ペア:",
-    "Device already verified!": "デバイスはすでに確認済みです！",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "警告：デバイスはすでに検証済みですが、キーは一致しません！",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告: キー確認が失敗しました! %(userId)s とデバイス ％(deviceId)s の署名鍵は、提供された鍵 \"％(fingerprint)s\" と一致しない \"%(fprint)s\" です。 通信が傍受されている可能性があります!",
+    "Verifies a user, device, and pubkey tuple": "ユーザー、端末、および公開鍵タプルを検証します",
+    "Unknown (user, device) pair:": "不明な(ユーザー、端末) ペア:",
+    "Device already verified!": "端末はすでに確認済みです！",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "警告：端末はすでに検証済みですが、キーは一致しません！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告: キー確認が失敗しました! %(userId)s と端末 ％(deviceId)s の署名鍵は、提供された鍵 \"％(fingerprint)s\" と一致しない \"%(fprint)s\" です。 通信が傍受されている可能性があります!",
     "Verified key": "確認済みのキー",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "指定した署名鍵は、％(userId)s のデバイス％(deviceId)s から受け取った署名鍵と一致します。デバイスを検証済みとしてマークしました。",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "指定した署名鍵は、％(userId)s の端末％(deviceId)s から受け取った署名鍵と一致します。端末を検証済みとしてマークしました。",
     "Displays action": "アクションを表示",
     "Forces the current outbound group session in an encrypted room to be discarded": "暗号化されたルーム内の現在のアウトバウンドグループセッションを強制的に破棄します",
     "Unrecognised command:": "認識できないコマンド:",
@@ -374,7 +374,7 @@
     "%(targetName)s accepted an invitation.": "%(targetName)s は招待を受け入れました。",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s はVoIP会議を要求しました。",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s は %(targetName)s を招待しました。",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s は %(targetName)s を追放しました。",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s は %(targetName)s をBANしました。",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s は、表示名を %(displayName)s に変更しました。",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s は、表示名を %(displayName)s に設定します。",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s は表示名 (%(oldDisplayName)s) を削除しました。",
@@ -385,7 +385,7 @@
     "VoIP conference finished.": "VoIP会議が終了しました。",
     "%(targetName)s rejected the invitation.": "%(targetName)s は招待を拒否しました。",
     "%(targetName)s left the room.": "%(targetName)s は部屋を出ました。",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s は %(targetName)s のブロックを解除しました。",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s は %(targetName)s をBAN解除しました。",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s は %(targetName)s を追放しました。",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s は %(targetName)s の招待を撤回しました。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s はトピックを \"%(topic)s\" に変更しました。",
@@ -397,8 +397,8 @@
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s はこの部屋のアドレスとして %(removedAddresses)s を削除しました。",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s はこの部屋のアドレスとして %(removedAddresses)s を削除しました。",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s はこの部屋のアドレスとして %(addedAddresses)s を追加し、%(removedAddresses)s を削除しました。",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s は、この部屋のメインアドレスを %(address)s に設定しました。",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s はこの部屋のメインアドレスを削除しました。",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s は、この部屋の主アドレスを %(address)s に設定しました。",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s はこの部屋の主アドレスを削除しました。",
     "Someone": "誰か",
     "(not supported by this browser)": "(このブラウザではサポートされていません)",
     "%(senderName)s answered the call.": "%(senderName)s が応答しました。",
@@ -436,5 +436,301 @@
     "Authentication check failed: incorrect password?": "認証チェックに失敗しました: パスワードの間違い?",
     "Sorry, your homeserver is too old to participate in this room.": "申し訳ありませんが、あなたのホームサーバーはこの部屋に参加するには古すぎます。",
     "Please contact your homeserver administrator.": "ホームサーバー管理者に連絡してください。",
-    "Failed to join room": "部屋に参加できませんでした"
+    "Failed to join room": "部屋に参加できませんでした",
+    "Message Pinning": "メッセージ留め",
+    "Increase performance by only loading room members on first view": "最初のビューではルームメンバーを読み込むだけにしてパフォーマンスを向上させる",
+    "Disable Emoji suggestions while typing": "入力中に絵文字の候補を無効にする",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "参加/離脱メッセージを非表示にする (招待/キック/禁止は影響を受けない)",
+    "Hide avatar changes": "アバター変更を隠す",
+    "Hide display name changes": "表示名の変更を表示しない",
+    "Always show encryption icons": "常に暗号化アイコンを表示する",
+    "Enable automatic language detection for syntax highlighting": "構文強調表示の自動言語検出を有効にする",
+    "Hide avatars in user and room mentions": "ユーザーや部屋でアバターを非表示にする",
+    "Disable big emoji in chat": "チャットで大きな絵文字を無効にする",
+    "Mirror local video feed": "ローカルビデオ映像送信",
+    "Disable Community Filter Panel": "コミュニティフィルタパネルを無効にする",
+    "Disable Peer-to-Peer for 1:1 calls": "1対1通話でピアツーピアを無効にする",
+    "Send analytics data": "分析データを送信する",
+    "Never send encrypted messages to unverified devices from this device": "この端末から未認証の端末に暗号化されたメッセージを送信しない",
+    "Never send encrypted messages to unverified devices in this room from this device": "この端末からこの部屋の未認証の端末に暗号化されたメッセージを送信しないでください",
+    "Enable inline URL previews by default": "デフォルトでインラインURLプレビューを有効にする",
+    "Enable URL previews for this room (only affects you)": "この部屋のURLプレビューを有効にする (あなたにのみ影響する)",
+    "Enable URL previews by default for participants in this room": "この部屋の参加者のためにデフォルトでURLプレビューを有効にする",
+    "Room Colour": "部屋の色",
+    "Enable widget screenshots on supported widgets": "サポートされているウィジェットでウィジェットのスクリーンショットを有効にする",
+    "Show empty room list headings": "空の部屋リスト見出しを表示する",
+    "Active call (%(roomName)s)": "アクティブな通話 (%(roomName)s)",
+    "unknown caller": "不明な発信者",
+    "Incoming voice call from %(name)s": "%(name)s からの着信音声コール",
+    "Incoming video call from %(name)s": "%(name)s からの着信ビデオコール",
+    "Incoming call from %(name)s": "%(name)s からの着信コール",
+    "Decline": "辞退",
+    "Accept": "受諾",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "テキストメッセージが +%(msisdn)s に送信されました。 含まれている確認コードを入力してください",
+    "Incorrect verification code": "認証コードの誤りです",
+    "Enter Code": "コードを入力する",
+    "Submit": "提出",
+    "Phone": "電話",
+    "Add phone number": "電話番号を追加",
+    "Failed to upload profile picture!": "プロフィール写真をアップロードできませんでした!",
+    "Upload new:": "新しいアップロード:",
+    "No display name": "表示名なし",
+    "New passwords don't match": "新しいパスワードが一致しません",
+    "Passwords can't be empty": "パスワードを空にすることはできません",
+    "Warning!": "警告!",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "パスワードを変更すると、すべての端末のエンドツーエンドの暗号化キーがリセットされ、暗号化されたチャット履歴は読み取れなくなります (最初にルームキーをエクスポートしてから再インポートする場合を除く)。 将来これは改善されるでしょう。",
+    "Export E2E room keys": "E2Eルームキーをエクスポートする",
+    "Do you want to set an email address?": "メールアドレスを設定しますか?",
+    "Password": "パスワード",
+    "Confirm password": "確認のパスワード",
+    "Your home server does not support device management.": "ホームサーバーは端末管理をサポートしていません。",
+    "Unable to load device list": "端末リストを読み込めません",
+    "Authentication": "認証",
+    "Delete %(count)s devices|other": "%(count)s 件の端末を削除する",
+    "Delete %(count)s devices|one": "端末を削除する",
+    "Device ID": "端末ID",
+    "Device Name": "端末名",
+    "Last seen": "最後のシーン",
+    "Select devices": "端末の選択",
+    "Failed to set display name": "表示名の設定に失敗しました",
+    "Disable Notifications": "通知を無効にする",
+    "Enable Notifications": "通知を有効にする",
+    "Off": "オフ",
+    "On": "オン",
+    "Cannot add any more widgets": "ウィジェットを追加できません",
+    "The maximum permitted number of widgets have already been added to this room.": "この部屋にウィジェットの最大許容数が既に追加されています。",
+    "Add a widget": "ウィジェットを追加する",
+    "Drop File Here": "ここにファイルをドロップする",
+    "Drop file here to upload": "アップロードするファイルをここにドロップする",
+    " (unsupported)": " (サポートされていない)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>音声</voiceText>または<videoText>ビデオ</videoText>として参加してください。",
+    "Ongoing conference call%(supportedText)s.": "進行中の会議通話 %(supportedText)s",
+    "This event could not be displayed": "このイベントは表示できませんでした",
+    "%(senderName)s sent an image": "%(senderName)s が画像を送信しました",
+    "%(senderName)s sent a video": "%(senderName)s が動画を送信しました",
+    "%(senderName)s uploaded a file": "%(senderName)s がファイルをアップロードしました",
+    "Options": "オプション",
+    "Your key share request has been sent - please check your other devices for key share requests.": "共有キーリクエストが送信されました - 共有キーリクエスト用の他の端末を確認してください。",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "共有キーリクエストは、他の端末に自動的に送信されます。 他の端末での共有キーリクエストを拒否または却下した場合は、ここをクリックしてこのセッションのキーを再度要求してください。",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "他の端末にこのメッセージのキーがない場合、それらの端末を復号化することはできません。",
+    "Key request sent.": "キーリクエストが送信されました。",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "他の端末から<requestLink>暗号化キーを再リクエスト</ requestLink>します。",
+    "Undecryptable": "解読不能",
+    "Encrypting": "暗号化",
+    "Encrypted, not sent": "暗号化され、送信されません",
+    "Encrypted by a verified device": "検証された端末によって暗号化されました",
+    "Encrypted by an unverified device": "未検証の端末によって暗号化されました",
+    "Unencrypted message": "暗号化されていないメッセージ",
+    "Please select the destination room for this message": "このメッセージを送り先部屋を選択してください",
+    "Blacklisted": "ブラックリストに載せた",
+    "Verified": "検証済み",
+    "Unverified": "未検証",
+    "device id: ": "端末id: ",
+    "Disinvite": "招待拒否",
+    "Kick": "追い出す",
+    "Disinvite this user?": "このユーザーを招待拒否しますか?",
+    "Kick this user?": "このユーザーを追い出しますか?",
+    "Failed to kick": "キックに失敗しました",
+    "e.g. %(exampleValue)s": "例えば %(exampleValue)s",
+    "Every page you use in the app": "アプリで使用するすべてのページ",
+    "Your User Agent": "ユーザーエージェント",
+    "Call Failed": "呼び出しに失敗しました",
+    "Review Devices": "端末を確認する",
+    "Automatically replace plain text Emoji": "自動的にプレーンテキスト絵文字を置き換える",
+    "Pin unread rooms to the top of the room list": "未読の部屋を部屋リストの上部にピン止めする",
+    "Pin rooms I'm mentioned in to the top of the room list": "ルームリストの上部に記載された部屋をピン止めする",
+    "Demote yourself?": "自身を降格しますか？",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "自分自身を降格させるときにこの変更を元に戻すことはできません。あなたが部屋の最後の特権ユーザーである場合、特権を回復することは不可能です。",
+    "Demote": "降格",
+    "Failed to mute user": "ユーザーのミュートに失敗しました",
+    "Failed to toggle moderator status": "モデレータステータスを切り替えることができませんでした",
+    "Failed to change power level": "権限レベルの変更に失敗しました",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "この変更を元に戻すことはできません。そのユーザーが自分と同じ権限レベルを持つように促します。",
+    "No devices with registered encryption keys": "登録された暗号化キーを持つ端末はありません",
+    "Devices": "端末",
+    "Ignore": "無視",
+    "Jump to read receipt": "既読へジャンプ",
+    "Invite": "招待",
+    "Share Link to User": "ユーザーへのリンクを共有する",
+    "User Options": "ユーザーオプション",
+    "Unmute": "ミュート解除",
+    "Revoke Moderator": "モデレーターを取り消す",
+    "Make Moderator": "モデレーターにする",
+    "Admin Tools": "管理者ツール",
+    "Level:": "レベル:",
+    "and %(count)s others...|other": "そして、他 %(count)s ...",
+    "and %(count)s others...|one": "そして、もう1つ...",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (パワー %(powerLevelNumber)s）",
+    "deleted": "",
+    "Attachment": "付属品",
+    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "現時点ではファイルで返信することはできませんので、返信なしに送信されます。",
+    "Upload Files": "ファイルをアップロードする",
+    "Are you sure you want to upload the following files?": "次のファイルをアップロードしますか？",
+    "Encrypted room": "暗号化された部屋",
+    "Unencrypted room": "暗号化されていない部屋",
+    "Hangup": "電話を切る",
+    "Voice call": "音声通話",
+    "Video call": "ビデオ通話",
+    "Show Text Formatting Toolbar": "テキストの書式設定ツールバーを表示する",
+    "Send an encrypted reply…": "暗号化された返信を送信する…",
+    "Send a reply (unencrypted)…": "(暗号化されていない) 返信を送信する…",
+    "Send an encrypted message…": "暗号化されたメッセージを送信する…",
+    "Send a message (unencrypted)…": "(暗号化されていない) メッセージを送信する…",
+    "This room has been replaced and is no longer active.": "この部屋は交換されており、もうアクティブではありません。",
+    "The conversation continues here.": "会話はここで続けられます。",
+    "You do not have permission to post to this room": "この部屋に投稿する権限がありません",
+    "Turn Markdown off": "マークダウンをオフにする",
+    "Turn Markdown on": "マークダウンをオンにする",
+    "Hide Text Formatting Toolbar": "テキストの書式設定ツールバーを隠す",
+    "Server error": "サーバーエラー",
+    "Server unavailable, overloaded, or something else went wrong.": "サーバーが使用できない、オーバーロードされている、または何かが間違っていました。",
+    "Command error": "コマンドエラー",
+    "Unable to reply": "返信できません",
+    "At this time it is not possible to reply with an emote.": "現時点では、エモートで返信することはできません。",
+    "Markdown is disabled": "マークダウンは無効です",
+    "Markdown is enabled": "マークダウンは有効です",
+    "Jump to message": "メッセージにジャンプ",
+    "No pinned messages.": "固定メッセージはありません。",
+    "Loading...": "読み込み中...",
+    "Pinned Messages": "固定メッセージ",
+    "%(duration)ss": "%(duration)s 秒",
+    "%(duration)sm": "%(duration)s 分",
+    "%(duration)sh": "%(duration)s 時",
+    "%(duration)sd": "%(duration)s 日",
+    "Online for %(duration)s": "オンライン時間 %(duration)s",
+    "Idle for %(duration)s": "アイドル時間 %(duration)s",
+    "Offline for %(duration)s": "オフライン時間 %(duration)s",
+    "Unknown for %(duration)s": "不明な時間 %(duration)s",
+    "Idle": "アイドル",
+    "Offline": "オフライン",
+    "Unknown": "未知の",
+    "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s に %(userName)s が見た",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(dateTime)s に %(displayName)s (%(userName)s) が見た",
+    "Replying": "返信中",
+    "Failed to set avatar.": "アバターを設定できませんでした。",
+    "Save": "保存",
+    "(~%(count)s results)|other": "(~％(count)s 結果)",
+    "(~%(count)s results)|one": "(~%(count)s 結果)",
+    "Join Room": "部屋に入る",
+    "Remove avatar": "アバターを削除",
+    "Forget room": "部屋を忘れる",
+    "Share room": "部屋を共有する",
+    "Show panel": "パネルを表示する",
+    "Drop here to favourite": "お気に入りはここにドロップする",
+    "Drop here to tag direct chat": "ダイレクトチャットにタグを付けるためにここにドロップ",
+    "Drop here to restore": "復元するにはここにドロップ",
+    "Drop here to demote": "降格するにはここにドロップ",
+    "Drop here to tag %(section)s": "%(section)s にタグを付けるにはここにドロップ",
+    "Press <StartChatButton> to start a chat with someone": "<StartChatButton>を押すと、誰かとチャットを開始します",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "あなたはまだどの部屋にもいません! <CreateRoomButton>を押してルームを作成するか、<RoomDirectoryButton>を押してディレクトリをブラウズします",
+    "Community Invites": "コミュニティへの招待",
+    "Invites": "招待",
+    "Unban": "BAN解除",
+    "Ban": "BAN",
+    "Unban this user?": "このユーザーをBAN解除しますか?",
+    "Ban this user?": "このユーザーを利用禁止にしますか?",
+    "Failed to ban user": "ユーザーを利用禁止できませんでした",
+    "System Alerts": "システムアラート",
+    "Joining room...": "部屋に入る...",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "この招待状が送信されたアドレスがあなたのアカウントに関連付けられているアドレスと一致しているかどうかを確認できません。",
+    "This invitation was sent to an email address which is not associated with this account:": "この招待状はこのアカウントに関連付けられていないメールアドレスに送信されました:",
+    "You may wish to login with a different account, or add this email to this account.": "別のアカウントでログインするか、このメールをこのアカウントに追加することができます。",
+    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s からこの部屋に参加するように招待されました",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "この招待状を<acceptText>受諾</acceptText>または<declineText>辞退</declineText>しますか？",
+    "Reason: %(reasonText)s": "理由: %(reasonText)s",
+    "Rejoin": "再参加",
+    "You have been kicked from %(roomName)s by %(userName)s.": "あなたは %(userName)s により %(roomName)s から追い出されました。",
+    "You have been kicked from this room by %(userName)s.": "あなたは %(userName)s によりこの部屋から追い出されました。",
+    "You have been banned from %(roomName)s by %(userName)s.": "あなたは ％(userName)s により %(roomName)s から締め出されました。",
+    "You have been banned from this room by %(userName)s.": "あなたは %(userName)s によってこの部屋から閉め出されました。",
+    "This room": "この部屋",
+    "%(roomName)s does not exist.": "%(roomName)s は存在しません。",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s は現在アクセスできません。",
+    "You are trying to access %(roomName)s.": "%(roomName)s にアクセスしようとしています。",
+    "You are trying to access a room.": "ある部屋にアクセスしようとしています。",
+    "<a>Click here</a> to join the discussion!": "<a>ここをクリック</a>してディスカッションに参加してください!",
+    "This is a preview of this room. Room interactions have been disabled": "この部屋のプレビューです。 部屋の相互作用が無効になっています",
+    "To change the room's avatar, you must be a": "部屋のアバターを変更するのに必要な権限",
+    "To change the room's name, you must be a": "部屋の名前を変更するのに必要な権限",
+    "To change the room's main address, you must be a": "部屋の主アドレスを変更するのに必要な権限",
+    "To change the room's history visibility, you must be a": "部屋履歴の可視性を変更するのに必要な権限",
+    "To change the permissions in the room, you must be a": "部屋のパーミッションを変更するのに必要な権限",
+    "To change the topic, you must be a": "トピックを変更するのに必要な権限",
+    "To modify widgets in the room, you must be a": "部屋のウィジェットを変更するのに必要な権限",
+    "Failed to unban": "閉め出し解除に失敗しました",
+    "Banned by %(displayName)s": "%(displayName)s によって閉め出されました",
+    "Privacy warning": "プライバシーに関する警告",
+    "Changes to who can read history will only apply to future messages in this room": "履歴を読むことができる人への変更は、この部屋の将来のメッセージにのみ適用されます",
+    "The visibility of existing history will be unchanged": "既存の履歴の可視性は変更されません",
+    "End-to-end encryption is in beta and may not be reliable": "エンドツーエンドの暗号化はベータ版であり、信頼性がないかもしれません",
+    "You should not yet trust it to secure data": "データを保護するためにまだそれを信用すべきではありません",
+    "Devices will not yet be able to decrypt history from before they joined the room": "端末はまだ部屋に入る前の履歴を復号化することはできません",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "部屋の暗号化が有効になったら、(今のところ) もう一度電源を切ることはできません",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "暗号化されたメッセージは、まだ暗号化を実装していないクライアントでは表示されません",
+    "Encryption is not enabled in this room": "この部屋では暗号化が有効になっていません",
+    "The default role for new room members is": "新しいルームメンバーのデフォルトの役割は次のとおり",
+    "To send messages, you must be a": "メッセージを送信するのに必要な権限",
+    "To invite users into the room, you must be a": "ユーザーを会議室に招待するのに必要な権限",
+    "To configure the room, you must be a": "部屋を設定するのに必要な権限",
+    "To kick users, you must be a": "ユーザーを追い出すのに必要な権限",
+    "To ban users, you must be a": "ユーザーを閉め出すのに必要な権限",
+    "To remove other users' messages, you must be a": "他のユーザーのメッセージを削除するのに必要な権限",
+    "To notify everyone in the room, you must be a": "部屋の全員に通知するのに必要な権限",
+    "No users have specific privileges in this room": "この部屋には特定の権限を持つユーザーはいません",
+    "%(user)s is a %(userRole)s": "%(user)s は %(userRole)s です",
+    "Privileged Users": "特権ユーザー",
+    "Muted Users": "ミュートされたユーザー",
+    "Banned users": "追放されたユーザー",
+    "This room is not accessible by remote Matrix servers": "この部屋はリモートのMatrixサーバーからアクセスできない",
+    "Tagged as: ": "タグ付き: ",
+    "To link to a room it must have <a>an address</a>.": "部屋にリンクするには<a>アドレス</a>が必要です。",
+    "Guests cannot join this room even if explicitly invited.": "ゲストは、明示的に招待された場合でもこの部屋に参加することはできません。",
+    "Click here to fix": "修正するにはここをクリック",
+    "To send events of type <eventType/>, you must be a": "<eventType/>タイプのイベントを送信するのに必要な権限",
+    "Upgrade room to version %(ver)s": "部屋をバージョン %(ver)s にアップグレードする",
+    "Who can access this room?": "誰がこの部屋にアクセスできますか？",
+    "Publish this room to the public in %(domain)s's room directory?": "%(domain)s のルームディレクトリにこの部屋を公開しますか？",
+    "Who can read history?": "誰が履歴を読むことができますか？",
+    "Members only (since the point in time of selecting this option)": "メンバーのみ (このオプションを選択した時点以降)",
+    "Members only (since they were invited)": "メンバーのみ (招待されて以来)",
+    "Members only (since they joined)": "メンバーのみ (参加して以来)",
+    "Permissions": "アクセス許可",
+    "Advanced": "詳細",
+    "Internal room ID: ": "内部の部屋ID: ",
+    "Room version number: ": "部屋のバージョン番号: ",
+    "Add a topic": "トピックを追加",
+    "There is a known vulnerability affecting this room.": "この部屋には既知の脆弱性が存在します。",
+    "This room version is vulnerable to malicious modification of room state.": "この部屋のバージョンは、部屋の状態の悪意のある変更に対して脆弱です。",
+    "Click here to upgrade to the latest room version and ensure room integrity is protected.": "最新の部屋のバージョンにアップグレードし、部屋の完全性が確保されていることを確認するには、ここをクリックしてください。",
+    "Only room administrators will see this warning": "この警告はルーム管理者のみに表示されます",
+    "You don't currently have any stickerpacks enabled": "現在、使用可能なステッカーパックはありません",
+    "Add some now": "今すぐ追加",
+    "Stickerpack": "ステッカーパック",
+    "Hide Stickers": "ステッカーを隠す",
+    "Show Stickers": "ステッカーを表示",
+    "Scroll to unread messages": "未読メッセージにスクロールする",
+    "Jump to first unread message.": "最初の未読メッセージにジャンプします。",
+    "Invalid alias format": "無効なエイリアス形式",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' はエイリアスの有効な形式ではありません",
+    "Invalid address format": "無効なアドレス形式",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' は有効なアドレス形式ではありません",
+    "not specified": "指定されていない",
+    "not set": "設定されていない",
+    "Remote addresses for this room:": "この部屋のリモートアドレス:",
+    "Addresses": "アドレス",
+    "The main address for this room is": "この部屋の主アドレスは",
+    "Local addresses for this room:": "この部屋のローカルアドレス:",
+    "This room has no local addresses": "この部屋にはローカルアドレスはありません",
+    "New address (e.g. #foo:%(localDomain)s)": "新しいアドレス (例 #foo:%(localDomain)s）",
+    "Invalid community ID": "無効なコミュニティID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' は有効なコミュニティIDではありません",
+    "Showing flair for these communities:": "これらのコミュニティの特色を示す:",
+    "This room is not showing flair for any communities": "この部屋はどんなコミュニティに対しても特色を表示していません",
+    "New community ID (e.g. +foo:%(localDomain)s)": "新しいコミュニティID (例 +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "デフォルトでURLプレビューが<a>有効</a>です。",
+    "You have <a>disabled</a> URL previews by default.": "デフォルトでURLプレビューが<a>無効</a>です。",
+    "URL previews are enabled by default for participants in this room.": "この部屋の参加者は、デフォルトでURLプレビューが有効です。",
+    "URL previews are disabled by default for participants in this room.": "この部屋の参加者は、デフォルトでURLプレビューが無効です。",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "このような暗号化された部屋では、URLプレビューはデフォルトで無効になっており、あなたのホームサーバー（プレビューが生成された場所）がこの部屋に表示されているリンクに関する情報を収集できないようにしています。",
+    "URL Previews": "URLプレビュー"
 }

From 50768327e2232888b9b11204f7287352adb49606 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 2 Nov 2018 18:16:41 +0000
Subject: [PATCH 141/218] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index b49384891c..4fa54e08c3 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1291,5 +1291,11 @@
     "Clear cache and resync": "Изчисти кеша и ресинхронизирай",
     "Please accept all of the policies": "Моля, приемете всички политики",
     "Please review and accept the policies of this homeserver:": "Моля, прегледайте и приемете политиките на този сървър:",
-    "Add some now": "Добави сега"
+    "Add some now": "Добави сега",
+    "Pin unread rooms to the top of the room list": "Закачане на непрочетени стаи най-отгоре в списъка",
+    "Pin rooms I'm mentioned in to the top of the room list": "Закачане на споменаващи ме стаи най-отгоре в списъка",
+    "Joining room...": "Влизане в стая...",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Вие сте администратор на тази общност. Няма да можете да се присъедините пак без покана от друг администратор.",
+    "Open Devtools": "Отваряне на инструменти на разработчика",
+    "Show developer tools": "Покажи инструментите за разработчици"
 }

From 578136fa3062219cb6f7ff2cca86814ee6c23a88 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 3 Nov 2018 08:23:53 +0000
Subject: [PATCH 142/218] Translated using Weblate (Basque)

Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 0d25b988ad..6eaf55259e 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1296,5 +1296,7 @@
     "Joining room...": "Gelara elkartzen...",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Komunitate honen administratzailea zara. Ezin izango duzu berriro elkartu ez bazaitu beste administratzaile batek gonbidatzen.",
     "Open Devtools": "Ireki garapen tresnak",
-    "Show developer tools": "Erakutsi garapen tresnak"
+    "Show developer tools": "Erakutsi garapen tresnak",
+    "Pin unread rooms to the top of the room list": "Finkatu irakurri gabeko gelak gelen zerrendaren goialdean",
+    "Pin rooms I'm mentioned in to the top of the room list": "Finkatu aipatu nauten gelak gelen zerrendaren goialdean"
 }

From 450b226632fe7c4f0c19bdec937c4d9eccd25cd6 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Sat, 3 Nov 2018 13:32:47 +0000
Subject: [PATCH 143/218] Translated using Weblate (German)

Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 5cb856b651..88667bdb0d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1291,5 +1291,12 @@
     "Incompatible local cache": "Inkompatibler lokaler Zwischenspeicher",
     "Clear cache and resync": "Zwischenspeicher löschen und erneut synchronisieren",
     "Please accept all of the policies": "Bitte akzeptiere alle Bedingungen",
-    "Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:"
+    "Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:",
+    "Pin unread rooms to the top of the room list": "Ungelesene Räume oben an der Raumliste anheften",
+    "Pin rooms I'm mentioned in to the top of the room list": "Räume mit Erwähnungen oben an der Raumliste anheften",
+    "Joining room...": "Trete Raum bei...",
+    "Add some now": "Füge jetzt hinzu",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein Administrator dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem anderen Administrator eingeladen wirst.",
+    "Open Devtools": "Öffne Entwickler-Werkzeuge",
+    "Show developer tools": "Zeige Entwickler-Werkzeuge"
 }

From f9d5c11d8d373ce6d521ce436b5e6ccdaa4604aa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 4 Nov 2018 19:47:24 -0700
Subject: [PATCH 144/218] Regenerate the room list when m.fully_read is issued

Not doing so results in the RoomListStore tracking stale data when the user reads messages on another device. The visual effect of this is rooms being incorrectly pinned in places they shouldn't be, such as the top of the list. This also fixes another visual bug where rooms don't move down once their timelines are read. This second issue is mot prominent when multiple rooms have been pinned to the top, and the middle one is read ahead of the others - it'll stick around until some other condition decides to wipe the room's cached state.

Fixes https://github.com/vector-im/riot-web/issues/7653
---
 src/actions/MatrixActionCreators.js | 30 +++++++++++++++++++++++++++++
 src/stores/RoomListStore.js         |  7 +++++++
 2 files changed, 37 insertions(+)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 31bcac3e52..2f2c23d06f 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -62,6 +62,35 @@ function createAccountDataAction(matrixClient, accountDataEvent) {
     };
 }
 
+/**
+ * @typedef RoomAccountDataAction
+ * @type {Object}
+ * @property {string} action 'MatrixActions.Room.accountData'.
+ * @property {MatrixEvent} event the MatrixEvent that triggered the dispatch.
+ * @property {string} event_type the type of the MatrixEvent, e.g. "m.direct".
+ * @property {Object} event_content the content of the MatrixEvent.
+ * @property {Room} room the room where the account data was changed.
+ */
+
+/**
+ * Create a MatrixActions.Room.accountData action that represents a MatrixClient `Room.accountData`
+ * matrix event.
+ *
+ * @param {MatrixClient} matrixClient the matrix client.
+ * @param {MatrixEvent} accountDataEvent the account data event.
+ * @param {Room} room the room where account data was changed
+ * @returns {RoomAccountDataAction} an action of type MatrixActions.accountData.
+ */
+function createRoomAccountDataAction(matrixClient, accountDataEvent, room) {
+    return {
+        action: 'MatrixActions.Room.accountData',
+        event: accountDataEvent,
+        event_type: accountDataEvent.getType(),
+        event_content: accountDataEvent.getContent(),
+        room: room,
+    };
+}
+
 /**
  * @typedef RoomAction
  * @type {Object}
@@ -201,6 +230,7 @@ export default {
     start(matrixClient) {
         this._addMatrixClientListener(matrixClient, 'sync', createSyncAction);
         this._addMatrixClientListener(matrixClient, 'accountData', createAccountDataAction);
+        this._addMatrixClientListener(matrixClient, 'Room.accountData', createRoomAccountDataAction);
         this._addMatrixClientListener(matrixClient, 'Room', createRoomAction);
         this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
         this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 2b70d53b59..0f8e5d7b4d 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -142,6 +142,13 @@ class RoomListStore extends Store {
                 this._generateRoomLists();
             }
             break;
+            case 'MatrixActions.Room.accountData': {
+                if (payload.event_type === 'm.fully_read') {
+                    this._clearCachedRoomState(payload.room.roomId);
+                    this._generateRoomLists();
+                }
+            }
+            break;
             case 'MatrixActions.Room.myMembership': {
                 this._generateRoomLists();
             }

From ec2528e8b5f1c015e1c35e2f87c9c9eb9f748344 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 4 Nov 2018 23:00:47 -0700
Subject: [PATCH 145/218] Update MatrixActionCreators.js

---
 src/actions/MatrixActionCreators.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 2f2c23d06f..c1d42ffd0d 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -79,7 +79,7 @@ function createAccountDataAction(matrixClient, accountDataEvent) {
  * @param {MatrixClient} matrixClient the matrix client.
  * @param {MatrixEvent} accountDataEvent the account data event.
  * @param {Room} room the room where account data was changed
- * @returns {RoomAccountDataAction} an action of type MatrixActions.accountData.
+ * @returns {RoomAccountDataAction} an action of type MatrixActions.Room.accountData.
  */
 function createRoomAccountDataAction(matrixClient, accountDataEvent, room) {
     return {

From 821cdc55c1695a8a00cf8196fe97c3bd75424b4a Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 2 Nov 2018 18:17:34 +0000
Subject: [PATCH 146/218] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4fa54e08c3..4c390cfade 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1296,6 +1296,6 @@
     "Pin rooms I'm mentioned in to the top of the room list": "Закачане на споменаващи ме стаи най-отгоре в списъка",
     "Joining room...": "Влизане в стая...",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Вие сте администратор на тази общност. Няма да можете да се присъедините пак без покана от друг администратор.",
-    "Open Devtools": "Отваряне на инструменти на разработчика",
+    "Open Devtools": "Отвори инструментите за разработчици",
     "Show developer tools": "Покажи инструментите за разработчици"
 }

From 6df367f95a087a791940cd1d7f0878813556287c Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Mon, 5 Nov 2018 09:27:25 +0000
Subject: [PATCH 147/218] Translated using Weblate (Japanese)

Currently translated at 75.6% (964 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 234 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 233 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index e188d821ad..4194e72b6a 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -732,5 +732,237 @@
     "URL previews are enabled by default for participants in this room.": "この部屋の参加者は、デフォルトでURLプレビューが有効です。",
     "URL previews are disabled by default for participants in this room.": "この部屋の参加者は、デフォルトでURLプレビューが無効です。",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "このような暗号化された部屋では、URLプレビューはデフォルトで無効になっており、あなたのホームサーバー（プレビューが生成された場所）がこの部屋に表示されているリンクに関する情報を収集できないようにしています。",
-    "URL Previews": "URLプレビュー"
+    "URL Previews": "URLプレビュー",
+    "You have no historical rooms": "履歴のある部屋がありません",
+    "Historical": "履歴のある",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "メッセージにURLを入力すると、URLプレビューが表示され、タイトル、説明、ウェブサイトからの画像など、そのリンクに関する詳細情報が表示されます。",
+    "Error decrypting audio": "オーディオの復号化エラー",
+    "Error decrypting attachment": "添付ファイルの復号化エラー",
+    "Decrypt %(text)s": "%(text)s を解読する",
+    "Download %(text)s": "%(text)s をダウンロード",
+    "Invalid file%(extra)s": "無効なファイル %(extra)s",
+    "Error decrypting image": "イメージの復号化エラー",
+    "Error decrypting video": "動画の復号化エラー",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s が %(roomName)s のアバターを変更しました",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s がルームアバターを削除しました。",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s はルームアバターを<img/>に変更しました",
+    "This room is a continuation of another conversation.": "この部屋は別の会話の続きです。",
+    "Click here to see older messages.": "古いメッセージを見るにはここをクリックしてください。",
+    "Copied!": "コピーされました!",
+    "Failed to copy": "コピーに失敗しました",
+    "Add an Integration": "統合を追加する",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "サードパーティのサイトに移動して、%(integationsUrl)s で使用するためにアカウントを認証できるようになります。続行しますか？",
+    "Removed or unknown message type": "削除されたまたは未知のメッセージタイプ",
+    "Message removed by %(userId)s": "%(userId)s によってメッセージが削除されました",
+    "Message removed": "メッセージが削除された",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "現在のところ、ロボットチェックはデスクトップ上ではご利用いただけません - <a>ウェブブラウザ</a>を使用してください",
+    "This Home Server would like to make sure you are not a robot": "このHome Serverはあなたがロボットではないことを確認します",
+    "Sign in with CAS": "CASでサインインする",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "カスタムサーバーオプションを使用して、別のホームサーバーURLを指定して、他のMatrixサーバーにサインインすることができます。",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "これにより、別のホームサーバー上の既存のMatrixアカウントでこのアプリケーションを使用することができます。",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "カスタムアイデンティティサーバーを設定することもできますが、通常は電子メールアドレスに基づいてユーザーとのやりとりを防止します。",
+    "To continue, please enter your password.": "続行するには、パスワードを入力してください。",
+    "Password:": "パスワード:",
+    "Please review and accept the policies of this homeserver:": "このホームサーバーのポリシーを確認し、同意してください:",
+    "An email has been sent to %(emailAddress)s": "電子メールが %(emailAddress)s に送信されました。",
+    "Please check your email to continue registration.": "登録を続行するにはメールをご確認ください。",
+    "Token incorrect": "間違ったトークン",
+    "A text message has been sent to %(msisdn)s": "テキストメッセージが %(msisdn)s に送信されました",
+    "Please enter the code it contains:": "それに含まれるコードを入力してください:",
+    "Code": "コード",
+    "Start authentication": "認証を開始する",
+    "The email field must not be blank.": "電子メールフィールドは空白であってはいけません。",
+    "The user name field must not be blank.": "ユーザー名フィールドは空白であってはなりません。",
+    "The phone number field must not be blank.": "電話番号フィールドは空白であってはいけません。",
+    "The password field must not be blank.": "パスワードフィールドは空白であってはいけません。",
+    "Username on %(hs)s": "%(hs)s のユーザー名",
+    "User name": "ユーザー名",
+    "Mobile phone number": "携帯電話番号",
+    "Forgot your password?": "パスワードを忘れましたか？",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
+    "Sign in with": "にログインする",
+    "Email address": "メールアドレス",
+    "Sign in": "サインイン",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "メールアドレスを指定しないと、パスワードをリセットできません。間違いありませんか？",
+    "Email address (optional)": "メールアドレス (オプション)",
+    "You are registering with %(SelectedTeamName)s": "あなたは %(SelectedTeamName)s で登録しています",
+    "Mobile phone number (optional)": "携帯電話番号 (オプション)",
+    "Default server": "デフォルトサーバー",
+    "Custom server": "カスタムサーバー",
+    "Home server URL": "ホームサーバーのURL",
+    "Identity server URL": "アイデンティティ・サーバーのURL",
+    "What does this mean?": "これはどういう意味ですか?",
+    "Remove from community": "コミュニティから削除",
+    "Disinvite this user from community?": "このユーザーをコミュニティから拒否しますか?",
+    "Remove this user from community?": "コミュニティからこのユーザーを削除しますか?",
+    "Failed to withdraw invitation": "招待を撤回できませんでした",
+    "Failed to remove user from community": "コミュニティからユーザーを削除できませんでした",
+    "Filter community members": "コミュニティメンバーをフィルタリングする",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "%(roomName)s を %(groupId)s から削除してもよろしいですか?",
+    "Removing a room from the community will also remove it from the community page.": "コミュニティから部屋を削除すると、コミュニティページからもその部屋が削除されます。",
+    "Failed to remove room from community": "コミュニティからの部屋の削除に失敗しました",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "%(groupName)s から '%(roomName)s' を削除できませんでした",
+    "Something went wrong!": "何かが間違っていた!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "%(groupId)s の '%(roomName)s' の表示を更新できませんでした。",
+    "Visibility in Room List": "ルームリストの可視性",
+    "Visible to everyone": "みんなに見える",
+    "Only visible to community members": "コミュニティメンバーにのみ表示されます",
+    "Filter community rooms": "コミュニティルームをフィルタリングする",
+    "Something went wrong when trying to get your communities.": "コミュニティに参加しようとすると何かがうまくいかなかった。",
+    "Display your community flair in rooms configured to show it.": "それを表示するように構成された部屋にコミュニティの特色を表示します。",
+    "Show developer tools": "開発者ツールを表示",
+    "You're not currently a member of any communities.": "あなたは現在、どのコミュニティのメンバーでもありません。",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "<UsageDataLink>匿名利用データ</UsageDataLink>を送信して、Riot.imの改善を支援してください。 これはCookieを使用します (<PolicyLink>クッキーポリシー</PolicyLink>をご覧ください)>。",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "<UsageDataLink>匿名利用データ</UsageDataLink>を送信して、Riot.imの改善を支援してください。 これはクッキーを使用します。",
+    "Yes, I want to help!": "はい、協力します!",
+    "Please <a>contact your service administrator</a> to get this limit increased.": "この制限を増やすには、<a>サービス管理者にお問い合わせ</a>ください。",
+    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "このホームサーバーは月間アクティブユーザー数の上限に達しているため、<b>一部のユーザーはログインできません</ b>。",
+    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "このホームサーバーはリソース制限の1つを超えており、<b>一部のユーザーはログインできません</b>。",
+    "Unknown Address": "不明な住所",
+    "NOTE: Apps are not end-to-end encrypted": "注: アプリはエンドツーエンド暗号化されていません",
+    "Warning: This widget might use cookies.": "警告: このウィジェットはCookieを使用することがあります。",
+    "Do you want to load widget from URL:": "URLからウィジェットをロードしますか:",
+    "Allow": "許可",
+    "Delete Widget": "ウィジェットを削除",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "ウィジェットを削除すると、この部屋のすべてのユーザーのウィジェットが削除されます。 このウィジェットを削除してもいいですか？",
+    "Delete widget": "ウィジェットを削除",
+    "Failed to remove widget": "ウィジェットを削除できませんでした",
+    "An error ocurred whilst trying to remove the widget from the room": "ウィジェットをその部屋から削除しようとしているときにエラーが発生しました",
+    "Revoke widget access": "ウィジェットへのアクセスを取り消す",
+    "Minimize apps": "アプリを最小化する",
+    "Reload widget": "ウィジェットを再ロード",
+    "Popout widget": "ウィジェットをポップアウト",
+    "Picture": "画像",
+    "Unblacklist": "ブラックリスト解除",
+    "Blacklist": "ブラックリスト",
+    "Verify...": "検証中...",
+    "No results": "結果がありません",
+    "Communities": "コミュニティ",
+    "Home": "ホーム",
+    "Integrations Error": "統合エラー",
+    "Manage Integrations": "統合管理",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s が %(count)s 回参加しました",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s が参加しました",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s が %(count)s 回参加しました",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s が参加しました",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUers)s が %(count)s 回退室しました",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s が退室しました",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s が %(count)s 回退室しました",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s が退室しました",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s が%(count)s 回参加し、退室した",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s が参加して退室しました",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s が %(count)s 回参加し退室しました",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s が参加し退室しました",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s が %(count)s 回退室し再参加しました",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s が退室し再参加しました",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s が %(count)s 回退室し再参加しました",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s が退室し再参加しました",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s が %(count)s 回招待を拒否しました",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s が招待を拒否しました",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s が %(count)s 回招待を拒否しました",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s が招待を拒否しました",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s が招待を取り消しました",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s が %(count)s 回招待を取り消しました",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s が招待を取り消しました",
+    "were invited %(count)s times|other": "%(count)s 回招待されました",
+    "were invited %(count)s times|one": "招待されました",
+    "was invited %(count)s times|other": "%(count)s 回招待されました",
+    "was invited %(count)s times|one": "招待されました",
+    "were banned %(count)s times|other": "%(count)s 回追放されました",
+    "were banned %(count)s times|one": "追放されました",
+    "was banned %(count)s times|other": "%(count)s 回追放されました",
+    "was banned %(count)s times|one": "追放されました",
+    "were unbanned %(count)s times|other": "%(count)s 回追放解除されました",
+    "were unbanned %(count)s times|one": "追放解除されました",
+    "was unbanned %(count)s times|other": "%(count)s 回追放解除されました",
+    "were kicked %(count)s times|other": "%(count)s 回追い出しました",
+    "were kicked %(count)s times|one": "追い出されました",
+    "was kicked %(count)s times|other": "%(count)s 回追い出されました",
+    "was kicked %(count)s times|one": "追い出されました",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s が %(count)s 回名前を変更しました",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s が名前を変更しました",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s が %(count)s 回名前を変更しました",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s が名前を変更しました",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s が %(count)s 回アバターを変更しました",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s がアバターを変更しました",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s がアバターを %(count)s 回変更しました",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s がアバターを変更しました",
+    "%(items)s and %(count)s others|other": "%(items)s と 他 %(count)s 回",
+    "%(items)s and %(count)s others|one": "%(items)s と他の1つ",
+    "%(items)s and %(lastItem)s": "%(items)s と %(lastItem)s",
+    "collapse": "崩壊",
+    "expand": "拡大する",
+    "Custom of %(powerLevel)s": "%(powerLevel)s のカスタム",
+    "Custom level": "カスタムレベル",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "返信されたイベントを読み込めません。存在しないか、表示する権限がありません。",
+    "<a>In reply to</a> <pill>": "<a>返信</a> <pill>",
+    "And %(count)s more...|other": "そして %(count)s もっと...",
+    "ex. @bob:example.com": "例 @bob:example.com",
+    "Add User": "ユーザーを追加",
+    "Matrix ID": "Matirx ID",
+    "Matrix Room ID": "Matrix 部屋ID",
+    "email address": "メールアドレス",
+    "You have entered an invalid address.": "無効なアドレスを入力しました。",
+    "Try using one of the following valid address types: %(validTypesList)s.": "次の有効なアドレスタイプのいずれかを使用してください。%(validTypesList)s",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "ログを送信する前に、問題を説明するために<a>GitHubに論点を作成する</a>必要があります。",
+    "What GitHub issue are these logs for?": "これらのログはどのGitHubの問題ですか?",
+    "Create a new chat or reuse an existing one": "新しいチャットを作成するか、既存のチャットを再利用する",
+    "Start new chat": "新しいチャットを開始",
+    "You already have existing direct chats with this user:": "このユーザーには既に既存のチャットがあります:",
+    "Click on the button below to start chatting!": "チャットを開始するには、下のボタンをクリックしてください!",
+    "Confirm Removal": "削除の確認",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "このイベントを削除してもよろしいですか？部屋の名前やトピックの変更を削除すると、変更が取り消される可能性があります。",
+    "Community IDs cannot be empty.": "コミュニティIDは空にできません。",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "コミュニティIDには次の文字のみを含めることができます a-z, 0-9, or '=_-./'",
+    "Something went wrong whilst creating your community": "コミュニティを作成する時に何かがうまくいかなかった",
+    "Create Community": "コミュニティを作成する",
+    "Community Name": "コミュニティ名",
+    "Example": "例",
+    "Community ID": "コミュニティID",
+    "example": "例",
+    "Create": "作成する",
+    "Room name (optional)": "部屋名 (オプション)",
+    "Advanced options": "詳細オプション",
+    "Block users on other matrix homeservers from joining this room": "他のmatrixホームサーバーのユーザーをこの部屋に参加させないようにする",
+    "This setting cannot be changed later!": "この設定は後で変更することはできません!",
+    "Failed to indicate account erasure": "アカウントの削除を示すことができませんでした",
+    "Unknown error": "不明なエラー",
+    "Incorrect password": "間違ったパスワード",
+    "Deactivate Account": "アカウントを無効にする",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "これにより、あなたのアカウントは永久に使用できなくなります。ログインできなくなり、誰も同じユーザーIDを再登録できなくなります。これにより、参加しているすべてのルームから退室し、 IDサーバからあなたのアカウントの詳細が削除されます。<b>この操作は元に戻すことができません。</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "アカウントを無効にしても、<b>送信されたメッセージはデフォルトではなくなりません。</b>メッセージを忘れてしまった場合は、下のボックスにチェックを入れてください。",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrixのメッセージの可視性は電子メールと似ています。メッセージを忘れると、新規または未登録のユーザーと共有することができませんが、既にこれらのメッセージにアクセスしている登録ユーザーは、依然としてそのコピーにアクセスできます。",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "アカウントを無効にしたときに送信したすべてのメッセージを忘れてください (<b>警告:</b>これにより、今後のユーザーは会話履歴の全文を見ることができなくなります)",
+    "To continue, please enter your password:": "続行するには、パスワードを入力してください:",
+    "password": "パスワード",
+    "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "この端末が信頼できることを確認するには、他の方法 (個人や電話など) で所有者に連絡し、端末のユーザー設定で表示される鍵が以下のキーと一致するかどうかを尋ねてください:",
+    "Device name": "端末名",
+    "Device key": "端末キー",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "一致する場合は下の確認ボタンを押し、そうでない場合は他の誰かがこのデバイスを傍受しているので、代わりにブラックリストボタンを押してください。",
+    "In future this verification process will be more sophisticated.": "将来この検証プロセスはより洗練されたものになるでしょう。",
+    "Verify device": "デバイスの検証",
+    "I verify that the keys match": "キーが一致することを確認します",
+    "An error has occurred.": "エラーが発生しました。",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "暗号化キーを要求している新しい端末 '%(displayName)s' を追加しました。",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "未確認の端末 '%(displayName)s' が暗号化キーを要求しています。",
+    "Start verification": "検証を開始する",
+    "Share without verifying": "検証せずに共有する",
+    "Ignore request": "要求を無視する",
+    "Loading device info...": "端末情報を読み込んでいます...",
+    "Encryption key request": "暗号化キー要求",
+    "You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "以前 %(host)s にて、メンバーの遅延ロードを有効にしたRiotを使用していました。このバージョンでは、遅延ロードは無効です。ローカルキャッシュはこれらの2つの設定の間で互換性がないため、Riotはアカウントを再同期する必要があります。",
+    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "他のバージョンのRiotがまだ別のタブで開いている場合は、同じホスト上でRiotを使用するように閉じてください。遅延ロードが同時に有効と無効になっていると問題が発生します。",
+    "Incompatible local cache": "互換性のないローカルキャッシュ",
+    "Clear cache and resync": "キャッシュをクリアして再同期する",
+    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riotは、必要に応じて他のユーザーに関する情報をロードするだけで、メモリの使用量を3〜5倍減らしました。サーバーと再同期するのを待ってください!",
+    "Updating Riot": "Riot更新中",
+    "Failed to upgrade room": "部屋をアップグレードできませんでした",
+    "The room upgrade could not be completed": "部屋のアップグレードを完了できませんでした",
+    "Upgrade this room to version %(version)s": "この部屋をバージョン %(version)s にアップグレードします",
+    "Upgrade Room Version": "アップグレードルームバージョン",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "この部屋をアップグレードするには、現在の部屋のインスタンスを閉じて、新しい部屋を作成する必要があります。 部屋のメンバーに最高の体験を提供するため、私たちは以下を行います:",
+    "Create a new room with the same name, description and avatar": "同じ名前、説明、アバターで新しい部屋を作成する",
+    "Update any local room aliases to point to the new room": "新しいルームを指すようにローカルルームのエイリアスを更新する",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "古いバージョンの部屋でのユーザーの発言を停止し、新しい部屋に移動するようユーザーに通知するメッセージを投稿する"
 }

From 975392cbbbd3d30fa07a571bd329cfe048e71d42 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 5 Nov 2018 11:25:42 +0100
Subject: [PATCH 148/218] Add visible guest warning to encourage login

If you happen to get logged out, it might not be very clear what has happened
visually. This adds a visible warning to the top of the home page to suggest
logging in.

Fixes vector-im/riot-web#7629.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
---
 res/css/structures/_HomePage.scss     | 13 ++++++++
 src/components/structures/HomePage.js | 44 +++++++++++++++++++++++++++
 src/i18n/strings/en_EN.json           |  2 ++
 src/i18n/strings/en_US.json           |  2 ++
 4 files changed, 61 insertions(+)

diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index cdac1bcc8a..dc3158b39d 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -33,3 +33,16 @@ limitations under the License.
 .mx_HomePage_body {
 //  margin-left: 63px;
 }
+
+.mx_HomePage_guest_warning {
+    display: flex;
+    background-color: $secondary-accent-color;
+    border: 1px solid $accent-color;
+    margin: 20px;
+    padding: 20px 40px;
+    border-radius: 5px;
+}
+
+.mx_HomePage_guest_warning img {
+    padding-right: 10px;
+}
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index 89053b35c7..01aabf6115 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -23,6 +23,8 @@ import request from 'browser-request';
 import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
 import sdk from '../../index';
+import { MatrixClient } from 'matrix-js-sdk';
+import dis from '../../dispatcher';
 
 class HomePage extends React.Component {
     static displayName = 'HomePage';
@@ -37,6 +39,10 @@ class HomePage extends React.Component {
         homePageUrl: PropTypes.string,
     };
 
+    static contextTypes = {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    };
+
     state = {
             iframeSrc: '',
             page: '',
@@ -85,10 +91,47 @@ class HomePage extends React.Component {
         this._unmounted = true;
     }
 
+    onLoginClick() {
+        dis.dispatch({ action: 'start_login' });
+    }
+
+    onRegisterClick() {
+        dis.dispatch({ action: 'start_registration' });
+    }
+
     render() {
+        let guestWarning = "";
+        if (this.context.matrixClient.isGuest()) {
+            guestWarning = (
+                <div className="mx_HomePage_guest_warning">
+                    <img src="img/warning.svg" width="24" height="23" />
+                    <div>
+                        <div>
+                            { _t("You are currently using Riot anonymously as a guest.") }
+                        </div>
+                        <div>
+                            { _t(
+                                'If you would like to create a Matrix account you can <a>register</a> now.',
+                                {},
+                                { 'a': (sub) => <a href="#" onClick={this.onRegisterClick}>{ sub }</a> },
+                            ) }
+                        </div>
+                        <div>
+                            { _t(
+                                'If you already have a Matrix account you can <a>log in</a> instead.',
+                                {},
+                                { 'a': (sub) => <a href="#" onClick={this.onLoginClick}>{ sub }</a> },
+                            ) }
+                        </div>
+                    </div>
+                </div>
+            );
+        }
+
         if (this.state.iframeSrc) {
             return (
                 <div className="mx_HomePage">
+                    { guestWarning }
                     <iframe src={ this.state.iframeSrc } />
                 </div>
             );
@@ -96,6 +139,7 @@ class HomePage extends React.Component {
             const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
             return (
                 <GeminiScrollbarWrapper autoshow={true} className="mx_HomePage">
+                    { guestWarning }
                     <div className="mx_HomePage_body" dangerouslySetInnerHTML={{ __html: this.state.page }}>
                     </div>
                 </GeminiScrollbarWrapper>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 977ec072d6..572cc0d2b3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -927,7 +927,9 @@
     "Username available": "Username available",
     "To get started, please pick a username!": "To get started, please pick a username!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
+    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "You have successfully set a password!": "You have successfully set a password!",
     "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
     "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index d8733ab05a..ba37b5dc9c 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -644,7 +644,9 @@
     "Username not available": "Username not available",
     "Something went wrong!": "Something went wrong!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
+    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",

From 9017635c79eeb69201ea298ff3ca11e3a937ce92 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 7 Nov 2018 16:53:29 -0700
Subject: [PATCH 149/218] Support room IDs and event permalinks in the join
 command

Mostly useful for power users who want to jump to places more easily.

Examples:
* `/join !somewhere:example.org`
* `/join !somewhere:example.org altserver.com` - to join through `altserver.com`
* `/goto https://matrix.to/#/!somewhere:example.org/$something:example.org?via=altserver.com`

Fixes https://github.com/vector-im/riot-web/issues/3248
Fixes https://github.com/vector-im/riot-web/issues/7543
---
 src/SlashCommands.js | 83 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 3a8e77293b..712a7d0131 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -24,6 +24,8 @@ import sdk from './index';
 import {_t, _td} from './languageHandler';
 import Modal from './Modal';
 import SettingsStore, {SettingLevel} from './settings/SettingsStore';
+import {MATRIXTO_URL_PATTERN} from "./linkify-matrix";
+import * as querystring from "querystring";
 
 
 class Command {
@@ -152,12 +154,26 @@ export const CommandMap = {
         args: '<room-alias>',
         description: _td('Joins room with given alias'),
         runFn: function(roomId, args) {
+            console.log(args);
             if (args) {
-                const matches = args.match(/^(\S+)$/);
-                if (matches) {
-                    let roomAlias = matches[1];
-                    if (roomAlias[0] !== '#') return reject(this.getUsage());
+                // Note: we support 2 versions of this command. The first is
+                // the public-facing one for most users and the other is a
+                // power-user edition where someone may join via permalink or
+                // room ID with optional servers. Practically, this results
+                // in the following variations:
+                //   /join #example:example.org
+                //   /join !example:example.org
+                //   /join !example:example.org altserver.com elsewhere.ca
+                //   /join https://matrix.to/#/!example:example.org?via=altserver.com
+                // The command also supports event permalinks transparently:
+                //   /join https://matrix.to/#/!example:example.org/$something:example.org
+                //   /join https://matrix.to/#/!example:example.org/$something:example.org?via=altserver.com
+                const params = args.split(' ');
+                if (params.length < 1) return reject(this.getUsage());
 
+                const matrixToMatches = params[0].match(MATRIXTO_URL_PATTERN);
+                if (params[0][0] === '#') {
+                    let roomAlias = params[0];
                     if (!roomAlias.includes(':')) {
                         roomAlias += ':' + MatrixClientPeg.get().getDomain();
                     }
@@ -167,7 +183,65 @@ export const CommandMap = {
                         room_alias: roomAlias,
                         auto_join: true,
                     });
+                    return success();
+                } else if(params[0][0] === '!') {
+                    let roomId = params[0];
+                    let viaServers = params.splice(0);
 
+                    dis.dispatch({
+                        action: 'view_room',
+                        room_id: roomId,
+                        opts: {
+                            // These are passed down to the js-sdk's /join call
+                            server_name: viaServers,
+                        },
+                        auto_join: true,
+                    });
+                    return success();
+                } else if(matrixToMatches) {
+                    let entity = matrixToMatches[1];
+                    let eventId = null;
+                    let viaServers = [];
+
+                    if (entity[0] !== '!' && entity[0] !== '#') return reject(this.getUsage());
+
+                    if (entity.indexOf('?') !== -1) {
+                        const parts = entity.split('?');
+                        entity = parts[0];
+
+                        const parsed = querystring.parse(parts[1]);
+                        viaServers = parsed["via"];
+                        if (typeof viaServers === 'string') viaServers = [viaServers];
+                    }
+
+                    // We quietly support event ID permalinks too
+                    if (entity.indexOf('/$') !== -1) {
+                        const parts = entity.split("/$");
+                        entity = parts[0];
+                        eventId = `$${parts[1]}`;
+                    }
+
+                    const dispatch = {
+                        action: 'view_room',
+                        auto_join: true,
+                    };
+
+                    if (entity[0] === '!') dispatch["room_id"] = entity;
+                    else dispatch["room_alias"] = entity;
+
+                    if (eventId) {
+                        dispatch["event_id"] = eventId;
+                        dispatch["highlighted"] = true;
+                    }
+
+                    if (viaServers) {
+                        dispatch["opts"] = {
+                            // These are passed down to the js-sdk's /join call
+                            server_name: viaServers,
+                        }
+                    }
+
+                    dis.dispatch(dispatch);
                     return success();
                 }
             }
@@ -492,6 +566,7 @@ export const CommandMap = {
 const aliases = {
     j: "join",
     newballsplease: "discardsession",
+    goto: "join", // because it handles event permalinks magically
 };
 
 

From 88bfe6fc399ed6ea7cf9aeba198fa19ad2a8faae Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 7 Nov 2018 16:59:24 -0700
Subject: [PATCH 150/218] debugging--;

---
 src/SlashCommands.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 712a7d0131..b1884ae532 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -154,7 +154,6 @@ export const CommandMap = {
         args: '<room-alias>',
         description: _td('Joins room with given alias'),
         runFn: function(roomId, args) {
-            console.log(args);
             if (args) {
                 // Note: we support 2 versions of this command. The first is
                 // the public-facing one for most users and the other is a

From 5d804e1e574ff2dcce3881405d1323271f667d8e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 7 Nov 2018 17:01:47 -0700
Subject: [PATCH 151/218] Appease the linter

---
 src/SlashCommands.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index b1884ae532..8a34ba7ab1 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -183,9 +183,9 @@ export const CommandMap = {
                         auto_join: true,
                     });
                     return success();
-                } else if(params[0][0] === '!') {
-                    let roomId = params[0];
-                    let viaServers = params.splice(0);
+                } else if (params[0][0] === '!') {
+                    const roomId = params[0];
+                    const viaServers = params.splice(0);
 
                     dis.dispatch({
                         action: 'view_room',
@@ -197,7 +197,7 @@ export const CommandMap = {
                         auto_join: true,
                     });
                     return success();
-                } else if(matrixToMatches) {
+                } else if (matrixToMatches) {
                     let entity = matrixToMatches[1];
                     let eventId = null;
                     let viaServers = [];
@@ -237,7 +237,7 @@ export const CommandMap = {
                         dispatch["opts"] = {
                             // These are passed down to the js-sdk's /join call
                             server_name: viaServers,
-                        }
+                        };
                     }
 
                     dis.dispatch(dispatch);

From af5586c83d0fbb99cea1259f0e76bbfcd65dd3bb Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 8 Nov 2018 14:29:37 +0000
Subject: [PATCH 152/218] Translated using Weblate (Italian)

Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 962e179cc8..e367e8196f 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1290,5 +1290,12 @@
     "Incompatible local cache": "Cache locale non compatibile",
     "Clear cache and resync": "Svuota cache e risincronizza",
     "Please accept all of the policies": "Si prega di accettare tutte le condizioni",
-    "Please review and accept the policies of this homeserver:": "Consulta ed accetta le condizioni di questo homeserver:"
+    "Please review and accept the policies of this homeserver:": "Consulta ed accetta le condizioni di questo homeserver:",
+    "Pin unread rooms to the top of the room list": "Fissa le stanze non lette in cima all'elenco stanze",
+    "Pin rooms I'm mentioned in to the top of the room list": "Fissa le stanze dove sono menzionato in cima all'elenco stanze",
+    "Joining room...": "Ingresso nella stanza...",
+    "Add some now": "Aggiungine ora",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Sei un amministratore di questa comunità. Non potrai rientrare senza un invito da parte di un altro amministratore.",
+    "Open Devtools": "Apri Devtools",
+    "Show developer tools": "Mostra strumenti sviluppatore"
 }

From c39f43632744efd6ab9143cb9f5767ce4f3e16eb Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 8 Nov 2018 14:55:40 +0000
Subject: [PATCH 153/218] Added translation using Weblate (Romanian)

---
 src/i18n/strings/ro.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/ro.json

diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/ro.json
@@ -0,0 +1 @@
+{}

From 13039b05b9a04f7565f1bea52c4e28dbc796fd61 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 8 Nov 2018 17:17:57 +0100
Subject: [PATCH 154/218] Align buttons in encrypted event dialog

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
---
 res/css/views/dialogs/_EncryptedEventDialog.scss | 3 ++-
 res/css/views/rooms/_MemberDeviceInfo.scss       | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_EncryptedEventDialog.scss b/res/css/views/dialogs/_EncryptedEventDialog.scss
index b4dd353370..0dbaae24c1 100644
--- a/res/css/views/dialogs/_EncryptedEventDialog.scss
+++ b/res/css/views/dialogs/_EncryptedEventDialog.scss
@@ -24,4 +24,5 @@ limitations under the License.
     @mixin mx_DialogButton;
     background-color: $primary-bg-color;
     color: $accent-color;
-}
\ No newline at end of file
+    margin-top: 0px;
+}
diff --git a/res/css/views/rooms/_MemberDeviceInfo.scss b/res/css/views/rooms/_MemberDeviceInfo.scss
index 5888820e0d..d4e4bb1adf 100644
--- a/res/css/views/rooms/_MemberDeviceInfo.scss
+++ b/res/css/views/rooms/_MemberDeviceInfo.scss
@@ -19,7 +19,6 @@ limitations under the License.
 }
 
 .mx_MemberDeviceInfo.mx_DeviceVerifyButtons {
-    padding: 6px 0;
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;

From 5e3af70a230577d6637fe556c669e57272ee8f07 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 8 Nov 2018 15:00:02 +0000
Subject: [PATCH 155/218] Translated using Weblate (English (United States))

Currently translated at 67.5% (860 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
---
 src/i18n/strings/en_US.json | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index d8733ab05a..ffb75bdec5 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -838,5 +838,37 @@
     "Your homeserver's URL": "Your homeserver's URL",
     "Your identity server's URL": "Your identity server's URL",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
-    "Every page you use in the app": "Every page you use in the app"
+    "Every page you use in the app": "Every page you use in the app",
+    "e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
+    "Your User Agent": "Your User Agent",
+    "Your device resolution": "Your device resolution",
+    "The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
+    "Call Failed": "Call Failed",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
+    "Review Devices": "Review Devices",
+    "Call Anyway": "Call Anyway",
+    "Answer Anyway": "Answer Anyway",
+    "Call": "Call",
+    "Answer": "Answer",
+    "A conference call could not be started because the intgrations server is not available": "A conference call could not be started because the integrations server is not available",
+    "Call in Progress": "Call in Progress",
+    "A call is currently being placed!": "A call is currently being placed!",
+    "A call is already in progress!": "A call is already in progress!",
+    "Permission Required": "Permission Required",
+    "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "Who would you like to add to this community?": "Who would you like to add to this community?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID",
+    "Invite new community members": "Invite new community members",
+    "Name or matrix ID": "Name or matrix ID",
+    "Invite to Community": "Invite to Community",
+    "Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
+    "Show these rooms to non-members on the community page and room list?": "Show these rooms to non-members on the community page and room list?",
+    "Add rooms to the community": "Add rooms to the community",
+    "Room name or alias": "Room name or alias",
+    "Add to community": "Add to community",
+    "Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
+    "Failed to invite users to community": "Failed to invite users to community",
+    "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s"
 }

From bb1fedb3611e54e310eb775ef4df7b3fd81d5a6c Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 6 Nov 2018 12:46:46 +0000
Subject: [PATCH 156/218] Translated using Weblate (Esperanto)

Currently translated at 87.3% (1113 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 84912dccf9..aad2c0de8e 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1110,5 +1110,19 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Redemandi ĉifroŝlosilojn</requestLink> el viaj aliaj aparatoj.",
     "Encrypting": "Ĉifranta",
     "Encrypted, not sent": "Ĉifrita, ne sendita",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj aparatoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos malĉifri ĝin."
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj aparatoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos malĉifri ĝin.",
+    "Permission Required": "Necesas permeso",
+    "Registration Required": "Necesas registriĝo",
+    "You need to register to do this. Would you like to register now?": "Por fari ĉi tion, vi bezonas registriĝi. Ĉu vi volas registriĝi nun?",
+    "Missing roomId.": "Mankas identigilo de la ĉambro.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s aldonis %(addedAddresses)s kiel adresojn por la ĉambro.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s aldonis %(addedAddresses)s kiel adreson por la ĉambro.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s forigis %(removedAddresses)s kiel adresojn por la ĉambro.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s forigis %(removedAddresses)s kiel adreson por la ĉambro.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s aldonis %(addedAddresses)s kaj forigis %(removedAddresses)s kiel adresojn por la ĉambro.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s agordis la ĉefan adreson por la ĉambro al %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s forigis la ĉefan adreson de la ĉambro.",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Bonvolu <a>kontakti administranton de la servo</a> por daŭre uzadi la servon.",
+    "Pin unread rooms to the top of the room list": "Fiksi nelegitajn ĉambrojn supre de la listo",
+    "Pin rooms I'm mentioned in to the top of the room list": "Fiksi ĉambrojn kun mencioj de mia nomo supre de la listo"
 }

From 9533a33c88b2e483bdf7f2516eadc99f7ddf316b Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Thu, 8 Nov 2018 04:28:12 +0000
Subject: [PATCH 157/218] Translated using Weblate (Japanese)

Currently translated at 99.9% (1273 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 380 +++++++++++++++++++++++++++++++++++----
 1 file changed, 344 insertions(+), 36 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 4194e72b6a..3a52fc59c7 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -347,9 +347,9 @@
     "Joins room with given alias": "指定された別名で部屋に参加する",
     "Leave room": "部屋を出る",
     "Unrecognised room alias:": "認識されない部屋の別名:",
-    "Kicks user with given id": "与えられたIDを持つユーザーを追い出す",
-    "Bans user with given id": "指定されたIDでユーザーを禁止する",
-    "Unbans user with given id": "指定されたIDでユーザーのブロックを解除する",
+    "Kicks user with given id": "与えられたIDを持つユーザーを追放する",
+    "Bans user with given id": "指定されたIDでユーザーをブロックする",
+    "Unbans user with given id": "指定されたIDでユーザーをブロック解除する",
     "Ignores a user, hiding their messages from you": "ユーザーを無視し、自分からのメッセージを隠す",
     "Ignored user": "無視されたユーザー",
     "You are now ignoring %(userId)s": "%(userId)s を無視しています",
@@ -374,7 +374,7 @@
     "%(targetName)s accepted an invitation.": "%(targetName)s は招待を受け入れました。",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s はVoIP会議を要求しました。",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s は %(targetName)s を招待しました。",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s は %(targetName)s をBANしました。",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s は %(targetName)s をブロックしました。",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s は、表示名を %(displayName)s に変更しました。",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s は、表示名を %(displayName)s に設定します。",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s は表示名 (%(oldDisplayName)s) を削除しました。",
@@ -385,7 +385,7 @@
     "VoIP conference finished.": "VoIP会議が終了しました。",
     "%(targetName)s rejected the invitation.": "%(targetName)s は招待を拒否しました。",
     "%(targetName)s left the room.": "%(targetName)s は部屋を出ました。",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s は %(targetName)s をBAN解除しました。",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s は %(targetName)s をブロック解除しました。",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s は %(targetName)s を追放しました。",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s は %(targetName)s の招待を撤回しました。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s はトピックを \"%(topic)s\" に変更しました。",
@@ -440,7 +440,7 @@
     "Message Pinning": "メッセージ留め",
     "Increase performance by only loading room members on first view": "最初のビューではルームメンバーを読み込むだけにしてパフォーマンスを向上させる",
     "Disable Emoji suggestions while typing": "入力中に絵文字の候補を無効にする",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "参加/離脱メッセージを非表示にする (招待/キック/禁止は影響を受けない)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "参加/退出メッセージを非表示にする (招待/追放/ブロックは影響を受けない)",
     "Hide avatar changes": "アバター変更を隠す",
     "Hide display name changes": "表示名の変更を表示しない",
     "Always show encryption icons": "常に暗号化アイコンを表示する",
@@ -527,10 +527,10 @@
     "Unverified": "未検証",
     "device id: ": "端末id: ",
     "Disinvite": "招待拒否",
-    "Kick": "追い出す",
+    "Kick": "追放する",
     "Disinvite this user?": "このユーザーを招待拒否しますか?",
-    "Kick this user?": "このユーザーを追い出しますか?",
-    "Failed to kick": "キックに失敗しました",
+    "Kick this user?": "このユーザーを追放しますか?",
+    "Failed to kick": "追放できませんでした",
     "e.g. %(exampleValue)s": "例えば %(exampleValue)s",
     "Every page you use in the app": "アプリで使用するすべてのページ",
     "Your User Agent": "ユーザーエージェント",
@@ -561,7 +561,7 @@
     "and %(count)s others...|other": "そして、他 %(count)s ...",
     "and %(count)s others...|one": "そして、もう1つ...",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (パワー %(powerLevelNumber)s）",
-    "deleted": "",
+    "deleted": "deleted",
     "Attachment": "付属品",
     "At this time it is not possible to reply with a file so this will be sent without being a reply.": "現時点ではファイルで返信することはできませんので、返信なしに送信されます。",
     "Upload Files": "ファイルをアップロードする",
@@ -625,11 +625,11 @@
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "あなたはまだどの部屋にもいません! <CreateRoomButton>を押してルームを作成するか、<RoomDirectoryButton>を押してディレクトリをブラウズします",
     "Community Invites": "コミュニティへの招待",
     "Invites": "招待",
-    "Unban": "BAN解除",
-    "Ban": "BAN",
-    "Unban this user?": "このユーザーをBAN解除しますか?",
-    "Ban this user?": "このユーザーを利用禁止にしますか?",
-    "Failed to ban user": "ユーザーを利用禁止できませんでした",
+    "Unban": "ブロック解除",
+    "Ban": "ブロックする",
+    "Unban this user?": "このユーザーをブロック解除しますか?",
+    "Ban this user?": "このユーザーをブロックしますか?",
+    "Failed to ban user": "ユーザーをブロックできませんでした",
     "System Alerts": "システムアラート",
     "Joining room...": "部屋に入る...",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "この招待状が送信されたアドレスがあなたのアカウントに関連付けられているアドレスと一致しているかどうかを確認できません。",
@@ -639,10 +639,10 @@
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "この招待状を<acceptText>受諾</acceptText>または<declineText>辞退</declineText>しますか？",
     "Reason: %(reasonText)s": "理由: %(reasonText)s",
     "Rejoin": "再参加",
-    "You have been kicked from %(roomName)s by %(userName)s.": "あなたは %(userName)s により %(roomName)s から追い出されました。",
-    "You have been kicked from this room by %(userName)s.": "あなたは %(userName)s によりこの部屋から追い出されました。",
-    "You have been banned from %(roomName)s by %(userName)s.": "あなたは ％(userName)s により %(roomName)s から締め出されました。",
-    "You have been banned from this room by %(userName)s.": "あなたは %(userName)s によってこの部屋から閉め出されました。",
+    "You have been kicked from %(roomName)s by %(userName)s.": "あなたは %(userName)s により %(roomName)s から追放されました。",
+    "You have been kicked from this room by %(userName)s.": "あなたは %(userName)s によりこの部屋から追放されました。",
+    "You have been banned from %(roomName)s by %(userName)s.": "あなたは ％(userName)s により %(roomName)s からブロックされました。",
+    "You have been banned from this room by %(userName)s.": "あなたは %(userName)s によってこの部屋からブロックされました。",
     "This room": "この部屋",
     "%(roomName)s does not exist.": "%(roomName)s は存在しません。",
     "%(roomName)s is not accessible at this time.": "%(roomName)s は現在アクセスできません。",
@@ -657,8 +657,8 @@
     "To change the permissions in the room, you must be a": "部屋のパーミッションを変更するのに必要な権限",
     "To change the topic, you must be a": "トピックを変更するのに必要な権限",
     "To modify widgets in the room, you must be a": "部屋のウィジェットを変更するのに必要な権限",
-    "Failed to unban": "閉め出し解除に失敗しました",
-    "Banned by %(displayName)s": "%(displayName)s によって閉め出されました",
+    "Failed to unban": "ブロック解除に失敗しました",
+    "Banned by %(displayName)s": "%(displayName)s によってブロックされました",
     "Privacy warning": "プライバシーに関する警告",
     "Changes to who can read history will only apply to future messages in this room": "履歴を読むことができる人への変更は、この部屋の将来のメッセージにのみ適用されます",
     "The visibility of existing history will be unchanged": "既存の履歴の可視性は変更されません",
@@ -672,15 +672,15 @@
     "To send messages, you must be a": "メッセージを送信するのに必要な権限",
     "To invite users into the room, you must be a": "ユーザーを会議室に招待するのに必要な権限",
     "To configure the room, you must be a": "部屋を設定するのに必要な権限",
-    "To kick users, you must be a": "ユーザーを追い出すのに必要な権限",
-    "To ban users, you must be a": "ユーザーを閉め出すのに必要な権限",
+    "To kick users, you must be a": "ユーザーを追放するのに必要な権限",
+    "To ban users, you must be a": "ユーザーをブロックするのに必要な権限",
     "To remove other users' messages, you must be a": "他のユーザーのメッセージを削除するのに必要な権限",
     "To notify everyone in the room, you must be a": "部屋の全員に通知するのに必要な権限",
     "No users have specific privileges in this room": "この部屋には特定の権限を持つユーザーはいません",
     "%(user)s is a %(userRole)s": "%(user)s は %(userRole)s です",
     "Privileged Users": "特権ユーザー",
     "Muted Users": "ミュートされたユーザー",
-    "Banned users": "追放されたユーザー",
+    "Banned users": "ブロックされたユーザー",
     "This room is not accessible by remote Matrix servers": "この部屋はリモートのMatrixサーバーからアクセスできない",
     "Tagged as: ": "タグ付き: ",
     "To link to a room it must have <a>an address</a>.": "部屋にリンクするには<a>アドレス</a>が必要です。",
@@ -869,17 +869,17 @@
     "were invited %(count)s times|one": "招待されました",
     "was invited %(count)s times|other": "%(count)s 回招待されました",
     "was invited %(count)s times|one": "招待されました",
-    "were banned %(count)s times|other": "%(count)s 回追放されました",
-    "were banned %(count)s times|one": "追放されました",
-    "was banned %(count)s times|other": "%(count)s 回追放されました",
-    "was banned %(count)s times|one": "追放されました",
-    "were unbanned %(count)s times|other": "%(count)s 回追放解除されました",
-    "were unbanned %(count)s times|one": "追放解除されました",
-    "was unbanned %(count)s times|other": "%(count)s 回追放解除されました",
-    "were kicked %(count)s times|other": "%(count)s 回追い出しました",
-    "were kicked %(count)s times|one": "追い出されました",
-    "was kicked %(count)s times|other": "%(count)s 回追い出されました",
-    "was kicked %(count)s times|one": "追い出されました",
+    "were banned %(count)s times|other": "%(count)s 回ブロックされました",
+    "were banned %(count)s times|one": "ブロックされました",
+    "was banned %(count)s times|other": "%(count)s 回ブロックされました",
+    "was banned %(count)s times|one": "ブロックされました",
+    "were unbanned %(count)s times|other": "%(count)s 回ブロック解除されました",
+    "were unbanned %(count)s times|one": "ブロック解除されました",
+    "was unbanned %(count)s times|other": "%(count)s 回ブロック解除されました",
+    "were kicked %(count)s times|other": "%(count)s 回追放しました",
+    "were kicked %(count)s times|one": "追放されました",
+    "was kicked %(count)s times|other": "%(count)s 回追放されました",
+    "was kicked %(count)s times|one": "追放されました",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s が %(count)s 回名前を変更しました",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s が名前を変更しました",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s が %(count)s 回名前を変更しました",
@@ -964,5 +964,313 @@
     "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "この部屋をアップグレードするには、現在の部屋のインスタンスを閉じて、新しい部屋を作成する必要があります。 部屋のメンバーに最高の体験を提供するため、私たちは以下を行います:",
     "Create a new room with the same name, description and avatar": "同じ名前、説明、アバターで新しい部屋を作成する",
     "Update any local room aliases to point to the new room": "新しいルームを指すようにローカルルームのエイリアスを更新する",
-    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "古いバージョンの部屋でのユーザーの発言を停止し、新しい部屋に移動するようユーザーに通知するメッセージを投稿する"
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "古いバージョンの部屋でのユーザーの発言を停止し、新しい部屋に移動するようユーザーに通知するメッセージを投稿する",
+    "Mention": "記載",
+    "Flair will appear if enabled in room settings": "部屋の設定で有効になると、Flairが表示されます",
+    "Unverify": "未検証",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s が %(count)s 回招待を撤回した",
+    "was unbanned %(count)s times|one": "ブロック解除されました",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "新しい部屋の始めに古い部屋にリンクを張って、人々が古いメッセージを見ることができるようにする",
+    "Sign out": "サインアウト",
+    "Log out and remove encryption keys?": "ログアウトして暗号化キーを削除しますか?",
+    "Clear Storage and Sign Out": "ストレージのクリアとログアウト",
+    "Send Logs": "ログを送信する",
+    "Refresh": "リフレッシュ",
+    "Unable to restore session": "セッションを復元できません",
+    "We encountered an error trying to restore your previous session.": "以前のセッションを復元しようとしてエラーが発生しました。",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "以前にRiotの最新バージョンを使用していた場合、セッションはこのバージョンと互換性がない可能性があります。 このウィンドウを閉じて、最新のバージョンに戻ります。",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "ブラウザのストレージをクリアすると問題は解決するかもしれませんが、ログアウトして暗号化されたチャット履歴を読むことができなくなります。",
+    "Invalid Email Address": "無効なメールアドレス",
+    "This doesn't appear to be a valid email address": "これは有効なメールアドレスではないようです",
+    "Verification Pending": "検証の保留中",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "メールをチェックし、それに含まれているリンクをクリックしてください。 これが完了したら、[続行]をクリックします。",
+    "Unable to add email address": "メールアドレスを追加できません",
+    "Unable to verify email address.": "メールアドレスを確認できません。",
+    "This will allow you to reset your password and receive notifications.": "これにより、パスワードをリセットして通知を受け取ることができます。",
+    "Skip": "スキップ",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "ユーザー名には、文字、数字、ドット、ハイフン、アンダースコアのみを使用できます。",
+    "Username not available": "ユーザー名は利用できません",
+    "Username invalid: %(errMessage)s": "ユーザー名が無効です: %(errMessage)s",
+    "An error occurred: %(error_string)s": "エラーが発生しました: %(error_string)s",
+    "Username available": "利用可能なユーザー名",
+    "To get started, please pick a username!": "開始するには、ユーザー名を選んでください!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "これは<span>ホームサーバー</span>上のアカウント名ですが、<a>別のサーバー</a>を選択することもできます。",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "すでにMatrixアカウントをお持ちの場合は、代わりに<a>ログイン</a>することができます。",
+    "Share Room": "共有部屋",
+    "Link to most recent message": "最新のメッセージへのリンク",
+    "Share User": "ユーザーを共有",
+    "Share Community": "コミュニティを共有",
+    "Share Room Message": "部屋のメッセージを共有",
+    "Link to selected message": "選択したメッセージにリンクする",
+    "COPY": "コピー",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "現在、未検証の端末をブラックリストに登録しています。 これらの端末にメッセージを送信するには、それらの端末を検証する必要があります。",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "各端末の正当な所有者に属していることを確認するために各端末の検証プロセスを進めることをおすすめしますが、あなたが好むかどうかを確認せずにメッセージを再送信することができます。",
+    "Room contains unknown devices": "部屋には未知の端末が含まれています",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\"には以前見たことのない端末が含まれています。",
+    "Unknown devices": "未知の端末",
+    "Private Chat": "プライベートチャット",
+    "Public Chat": "パブリックチャット",
+    "Custom": "カスタム",
+    "Alias (optional)": "エイリアス (オプション)",
+    "Reject invitation": "招待を拒否する",
+    "Are you sure you want to reject the invitation?": "招待を拒否しますか?",
+    "Unable to reject invite": "招待を拒否できません",
+    "Share Message": "メッセージを共有",
+    "Collapse Reply Thread": "返信スレッドを折りたたむ",
+    "Name": "名前",
+    "Topic": "トピック",
+    "Make this room private": "この部屋をプライベートにする",
+    "Share message history with new users": "新しいユーザーとメッセージの履歴を共有する",
+    "Encrypt room": "部屋を暗号化",
+    "You must <a>register</a> to use this functionality": "この機能を使用するには<a>登録</a>する必要があります",
+    "You must join the room to see its files": "そのファイルを見るために部屋に参加する必要があります",
+    "There are no visible files in this room": "この部屋には目に見えるファイルはありません",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>コミュニティのページのHTML</h1>\n<p>\n     詳細な説明を使用して、新しいメンバーをコミュニティに紹介する、または配布する\n     重要な<a href=\"foo\">リンク</a>\n</p>\n<p>\n     あなたは 'img'タグを使うことさえできます\n</p>\n",
+    "Add rooms to the community summary": "コミュニティサマリーに部屋を追加する",
+    "Which rooms would you like to add to this summary?": "このサマリーにどの部屋を追加したいですか?",
+    "Add to summary": "サマリーに追加",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "%(groupId)s の要約に次の部屋を追加できませんでした:",
+    "Add a Room": "部屋を追加",
+    "Failed to remove the room from the summary of %(groupId)s": "%(groupId)s の要約から部屋を削除できませんでした",
+    "The room '%(roomName)s' could not be removed from the summary.": "'%(roomName)s' 部屋をサマリーから削除できませんでした。",
+    "Add users to the community summary": "コミュニティサマリーにユーザーを追加する",
+    "Who would you like to add to this summary?": "この要約に誰を追加しますか?",
+    "Failed to add the following users to the summary of %(groupId)s:": "%(groupId)s のサマリーに次のユーザーを追加できませんでした。",
+    "Add a User": "ユーザーを追加",
+    "Failed to remove a user from the summary of %(groupId)s": "%(groupId)s のサマリーからユーザーを削除できませんでした。",
+    "The user '%(displayName)s' could not be removed from the summary.": "ユーザー '%(displayName)s' をサマリーから削除できませんでした。",
+    "Failed to upload image": "画像のアップロードに失敗しました",
+    "Failed to update community": "コミュニティの更新に失敗しました",
+    "Unable to accept invite": "招待を受け入れることができません",
+    "Unable to join community": "コミュニティに参加できません",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "あなたはこのコミュニティの管理者です。 別の管理者からの招待なしには、再び参加することはできません。",
+    "Leave Community": "コミュニティから脱退する",
+    "Leave %(groupName)s?": "%(groupName)s を離れますか?",
+    "Unable to leave community": "コミュニティを離れることができません",
+    "Community Settings": "コミュニティ設定",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "コミュニティ<bold1>名</bold1>と<bold2>アバター</bold2>に対する変更は、他のユーザーには最大30分間表示されないことがあります。",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "これらの部屋は、コミュニティページのコミュニティメンバーに表示されます。 コミュニティメンバーは、それらをクリックして部屋に参加できます。",
+    "Featured Rooms:": "部屋の特徴:",
+    "Featured Users:": "ユーザーの特徴:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s があなたをこのコミュニティに招待しました",
+    "Join this community": "このコミュニティに参加する",
+    "Leave this community": "このコミュニティを離れる",
+    "You are an administrator of this community": "あなたはこのコミュニティの管理者です",
+    "You are a member of this community": "あなたはこのコミュニティのメンバーです",
+    "Who can join this community?": "誰がこのコミュニティに参加できますか?",
+    "Everyone": "全員",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "あなたのコミュニティには、説明がありません。コミュニティのメンバーに見せるHTMLページです。<br />ここをクリックして設定を開き、説明を加えてください!",
+    "Long Description (HTML)": "詳細説明 (HTML)",
+    "Description": "説明",
+    "Community %(groupId)s not found": "コミュニティ %(groupId)s が見つかりません",
+    "This Home server does not support communities": "このホームサーバーはコミュニティをサポートしていません",
+    "Failed to load %(groupId)s": "%(groupId)s をロードできませんでした",
+    "Failed to reject invitation": "招待を拒否できませんでした",
+    "This room is not public. You will not be able to rejoin without an invite.": "この部屋は公開されていません。 あなたは招待なしで再び参加することはできません。",
+    "Are you sure you want to leave the room '%(roomName)s'?": "本当にその部屋 '%(roomName)s' を離れますか?",
+    "Failed to leave room": "部屋を離れることができなかった",
+    "Can't leave Server Notices room": "サーバー通知部屋を離れることはできません",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "この部屋はホームサーバーからの重要なメッセージに使用されるため、そこを離れることはできません。",
+    "Signed Out": "サインアウト",
+    "For security, this session has been signed out. Please sign in again.": "セキュリティ上、このセッションはログアウトされています。 もう一度サインインしてください。",
+    "Terms and Conditions": "利用規約",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s ホームサーバーを引き続き使用するには、利用規約を確認して同意する必要があります。",
+    "Review terms and conditions": "利用規約を確認する",
+    "Old cryptography data detected": "古い暗号化データが検出されました",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riotの古いバージョンのデータが検出されました。 これにより、古いバージョンではエンドツーエンドの暗号化が機能しなくなります。 古いバージョンを使用している間に最近交換されたエンドツーエンドの暗号化されたメッセージは、このバージョンでは復号化できません。 これにより、このバージョンで交換されたメッセージが失敗することもあります。 問題が発生した場合は、ログアウトして再度ログインしてください。 メッセージ履歴を保持するには、キーをエクスポートして再インポートします。",
+    "Logout": "ログアウト",
+    "Your Communities": "あなたのコミュニティ",
+    "Did you know: you can use communities to filter your Riot.im experience!": "知っていましたか: コミュニティを使ってRiot.imの経験をフィルタリングすることができます！",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "フィルターを設定するには、画面左側のフィルターパネルへコミュニティアバターをドラッグします。フィルタパネルのアバターをクリックすると、そのコミュニティに関連付けられた部屋や人だけが表示されます。",
+    "Error whilst fetching joined communities": "参加したコミュニティを取得中にエラーが発生しました",
+    "Create a new community": "新しいコミュニティを作成する",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "ユーザーと部屋をグループ化するコミュニティを作成してください! Matrixユニバースにあなたの空間を目立たせるためにカスタムホームページを作成してください。",
+    "You have no visible notifications": "表示される通知はありません",
+    "Scroll to bottom of page": "ページの一番下にスクロールする",
+    "Message not sent due to unknown devices being present": "未知の端末が存在するためにメッセージが送信されない",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>端末表示</showDevicesText>、<sendAnywayText>とにかく送信</sendAnywayText>または<cancelText> キャンセル</cancelText>。",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "<consentLink>利用規約</consentLink> を確認して同意するまでは、いかなるメッセージも送信できません。",
+    "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーが月間アクティブユーザー制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
+    "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "このホームサーバーがリソース制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
+    "%(count)s of your messages have not been sent.|other": "メッセージの一部が送信されていません。",
+    "%(count)s of your messages have not been sent.|one": "あなたのメッセージは送信されませんでした。",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>すべて再送信</resendText>または<cancelText>すべてキャンセル</cancelText>。個々のメッセージを選択して、再送信またはキャンセルすることもできます。",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>メッセージ再送信</resendText>または<cancelText>メッセージキャンセル</cancelText>。",
+    "Connectivity to the server has been lost.": "サーバーへの接続が失われました。",
+    "Sent messages will be stored until your connection has returned.": "送信されたメッセージは、接続が返されるまで保存されます。",
+    "Active call": "アクティブコール",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "他に誰もいません! <inviteText>他のユーザーを招待</inviteText>または<nowarnText>空の部屋に関する警告を停止しますか</nowarnText>?",
+    "You seem to be uploading files, are you sure you want to quit?": "ファイルをアップロードしているようですが、中止しますか?",
+    "You seem to be in a call, are you sure you want to quit?": "通話中のようですが、本当にやめたいですか？",
+    "Failed to upload file": "ファイルのアップロードに失敗しました",
+    "Server may be unavailable, overloaded, or the file too big": "サーバーが使用できない、過負荷がかかっている、またはファイルが大きすぎるようです",
+    "Search failed": "検索に失敗しました",
+    "Server may be unavailable, overloaded, or search timed out :(": "サーバーが使用できない、オーバーロードされている、または検索がタイムアウトしているようです :(",
+    "No more results": "もう結果はありません",
+    "Unknown room %(roomId)s": "未知の部屋 %(roomId)s",
+    "Room": "部屋",
+    "Failed to save settings": "設定を保存できませんでした",
+    "Failed to reject invite": "招待を拒否できませんでした",
+    "Click to unmute video": "ビデオの音消解除するにはクリックしてください",
+    "Click to mute video": "ビデオの音を消すにはクリックしてください",
+    "Click to unmute audio": "オーディオの音消解除するにはクリックしてください",
+    "Click to mute audio": "オーディオの音を消すにはクリックしてください",
+    "Clear filter": "フィルタークリア",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "この部屋のタイムラインに特定のポイントをロードしようとしましたが、問題のメッセージを見る権限がありません。",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "この部屋のタイムラインに特定のポイントをロードしようとしましたが、それを見つけることができませんでした。",
+    "Failed to load timeline position": "タイムラインの位置を読み込めませんでした",
+    "Uploading %(filename)s and %(count)s others|other": "%(filename)s アップロード中、他 %(count)s 件",
+    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s アップロード中",
+    "Uploading %(filename)s and %(count)s others|one": "%(filename)s アップロード中、他 %(count)s 件",
+    "Can't load user settings": "ユーザー設定を読み込めません",
+    "Server may be unavailable or overloaded": "サーバーが使用できないか、またはオーバーロードされているようです",
+    "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "セキュリティのため、ログアウトするとこのブラウザからエンドツーエンドの暗号化キーがすべて削除されます。 将来のRiotセッションからの会話履歴を復号化できるようにしたい場合は、安全のためにルームキーをエクスポートしてください。",
+    "Success": "成功",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "パスワードが変更されました。再ログインするまで、他の端末のプッシュ通知を受け取ることはありません",
+    "Remove Contact Information?": "連絡先情報を削除しますか?",
+    "Remove %(threePid)s?": "%(threePid)s を削除しますか?",
+    "Unable to remove contact information": "連絡先情報を削除できません",
+    "Refer a friend to Riot:": "Riotに友達を紹介する:",
+    "Interface Language": "インタフェース言語",
+    "User Interface": "ユーザーインターフェース",
+    "Autocomplete Delay (ms):": "オートコンプリート遅延 (ms):",
+    "<not supported>": "<サポート対象外>",
+    "Import E2E room keys": "E2Eルームキーのインポート",
+    "Cryptography": "暗号",
+    "Device ID:": "端末ID:",
+    "Device key:": "端末キー:",
+    "Ignored Users": "無視されたユーザー",
+    "Submit Debug Logs": "デバッグログを送信する",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "GitHub経由でバグを提出した場合、デバッグログは問題の追跡に役立ちます。 デバッグログには、ユーザー名、訪問した部屋またはグループIDまたはエイリアス、および他のユーザーのユーザー名を含むアプリケーション使用データが含まれます。 それらはメッセージを含んでいません。",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "プライバシーは私たちにとって重要なので、私たちは分析のための個人情報や識別可能なデータを収集しません。",
+    "Learn more about how we use analytics.": "アナリティクスの使用方法の詳細については、こちらをご覧ください。",
+    "Labs": "ラボ",
+    "These are experimental features that may break in unexpected ways": "これらは予期しない方法で破られるかもしれない実験的な機能です",
+    "Use with caution": "慎重に使用する",
+    "Lazy loading members not supported": "遅延ローディングのメンバーはサポートされていません",
+    "Lazy loading is not supported by your current homeserver.": "遅延ロードは、現在のホームサーバーでサポートされていません。",
+    "Deactivate my account": "アカウントを無効にします",
+    "Legal": "法的",
+    "Clear Cache": "キャッシュの消去",
+    "Clear Cache and Reload": "キャッシュの消去と再ロード",
+    "Updates": "更新",
+    "Check for update": "更新を確認",
+    "Reject all %(invitedRooms)s invites": "%(invitedRooms)s すべての招待を拒否する",
+    "Bulk Options": "一括オプション",
+    "Desktop specific": "デスクトップ固有",
+    "Start automatically after system login": "システムログイン後に自動的に起動する",
+    "No media permissions": "メディア権限がありません",
+    "You may need to manually permit Riot to access your microphone/webcam": "自分のマイク/ウェブカメラにアクセスするために手動でRiotを許可する必要があるかもしれません",
+    "Missing Media Permissions, click here to request.": "メディアアクセス権がありません。ここをクリックしてリクエストしてください。",
+    "No Audio Outputs detected": "オーディオ出力が検出されなかった",
+    "Default Device": "標準端末",
+    "Audio Output": "音声出力",
+    "VoIP": "VoIP",
+    "Email": "Eメール",
+    "Add email address": "メールアドレスを追加",
+    "Profile": "プロフィール",
+    "Account": "アカウント",
+    "To return to your account in future you need to set a password": "将来あなたのアカウントに戻るには、パスワードを設定する必要があります",
+    "Logged in as:": "ログイン as:",
+    "Access Token:": "アクセストークン:",
+    "click to reveal": "クリックすると表示されます",
+    "Homeserver is": "ホームサーバーは",
+    "Identity Server is": "アイデンティティ・サーバー",
+    "matrix-react-sdk version:": "matrix-react-sdk version:",
+    "riot-web version:": "riot-web version:",
+    "olm version:": "olm version:",
+    "Failed to send email": "メールを送信できませんでした",
+    "The email address linked to your account must be entered.": "あなたのアカウントにリンクされているメールアドレスを入力する必要があります。",
+    "A new password must be entered.": "新しいパスワードを入力する必要があります。",
+    "New passwords must match each other.": "新しいパスワードは互いに一致する必要があります。",
+    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "現在、パスワードをリセットすると、すべての端末のエンドツーエンドの暗号化キーがリセットされ、暗号化されたチャット履歴は読み取れなくなります。最初にルームキーをエクスポートしてから再インポートする必要があります。 将来これは改善されるでしょう。",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "メールが %(emailAddress)s に送信されました。 リンクをたどったら、以下をクリックしてください。",
+    "I have verified my email address": "メールアドレスを確認しました",
+    "Your password has been reset": "あなたのパスワードはリセットされました",
+    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "あなたはすべての端末からログアウトしており、プッシュ通知を受け取ることはありません。 通知を再度有効にするには、各端末でもう一度ログインしてください",
+    "Return to login screen": "ログイン画面に戻る",
+    "To reset your password, enter the email address linked to your account": "パスワードをリセットするには、アカウントにリンクされているメールアドレスを入力してください",
+    "Confirm your new password": "新しいパスワードを確認する",
+    "Send Reset Email": "リセットメールを送信",
+    "Create an account": "アカウントを作成する",
+    "This Home Server does not support login using email address.": "このホームサーバーはメールアドレスを使用したログインをサポートしていません。",
+    "Please <a>contact your service administrator</a> to continue using this service.": "このサービスを続行するには、<a>サービス管理者にお問い合わせ</a>ください。",
+    "Incorrect username and/or password.": "不正なユーザー名またはパスワード。",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "matrix.orgではなく、%(hs)s サーバーにログインしていることに注意してください。",
+    "Guest access is disabled on this Home Server.": "このホームサーバーでゲストアクセスが無効になっています。",
+    "The phone number entered looks invalid": "入力された電話番号が無効です",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "このホームサーバーは、このクライアントでサポートされているログインフローを提供していません。",
+    "Error: Problem communicating with the given homeserver.": "エラー: 指定されたホームサーバーとの通信に問題があります。",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "HTTPS URLがブラウザバーにある場合、HTTP経由でホームサーバーに接続できません。 HTTPSを使用するか<a>安全でないスクリプトを有効にする</a>。",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "ホームサーバーに接続できません - 接続を確認し、<a>ホームサーバーのSSL証明書</a>が信頼できるものであり、ブラウザの拡張機能が要求をブロックしていないことを確認してください。",
+    "Try the app first": "最初にアプリを試してみてください",
+    "Sign in to get started": "開始するにはサインインしてください",
+    "Failed to fetch avatar URL": "アバターURLを取得できませんでした",
+    "Set a display name:": "表示名を設定する:",
+    "Upload an avatar:": "アバターをアップロードする:",
+    "Unable to query for supported registration methods": "サポートされている登録メソッドを照会できません",
+    "This server does not support authentication with a phone number.": "このサーバーは、電話番号による認証をサポートしていません。",
+    "Missing password.": "パスワードがありません。",
+    "Passwords don't match.": "パスワードが一致しません。",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "パスワードが短すぎます (min %(MIN_PASSWORD_LENGTH)s)。",
+    "This doesn't look like a valid email address.": "有効なメールアドレスではないようです。",
+    "This doesn't look like a valid phone number.": "有効な電話番号ではないようです。",
+    "An email address is required to register on this homeserver.": "このホームサーバーに登録するには、メールアドレスが必要です。",
+    "A phone number is required to register on this homeserver.": "このホームサーバーに登録するには、電話番号が必要です。",
+    "You need to enter a user name.": "ユーザー名を入力する必要があります。",
+    "An unknown error occurred.": "不明なエラーが発生しました。",
+    "I already have an account": "私はすでにアカウントを持っています",
+    "Commands": "コマンド",
+    "Results from DuckDuckGo": "DuckDuckGoの結果",
+    "Emoji": "絵文字",
+    "Notify the whole room": "部屋全体に通知する",
+    "Room Notification": "ルーム通知",
+    "Users": "ユーザー",
+    "unknown device": "未知の端末",
+    "NOT verified": "検証されていない",
+    "verified": "検証済み",
+    "Verification": "検証",
+    "Ed25519 fingerprint": "Ed25519 fingerprint",
+    "User ID": "ユーザーID",
+    "Curve25519 identity key": "Curve25519 identity key",
+    "none": "無し",
+    "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
+    "Algorithm": "アルゴリズム",
+    "unencrypted": "暗号化されていない",
+    "Decryption error": "復号化エラー",
+    "Session ID": "セッションID",
+    "End-to-end encryption information": "エンドツーエンド暗号化情報",
+    "Event information": "イベント情報",
+    "Sender device information": "送信者端末情報",
+    "Passphrases must match": "パスフレーズは一致する必要があります",
+    "Passphrase must not be empty": "パスフレーズは空であってはいけません",
+    "Export room keys": "ルームキーのエクスポート",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "このプロセスでは、暗号化されたルームで受信したメッセージのキーをローカルファイルにエクスポートできます。 その後、クライアントがこれらのメッセージを復号化できるように、ファイルを別のMatrixクライアントにインポートすることができます。",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "エクスポートされたファイルは、誰でも閲覧できる暗号化されたメッセージを復号化することができるので、安全に保つように注意する必要があります。 これを助けるには、下にあるパスフレーズを入力して、エクスポートされたデータを暗号化する必要があります。 同じパスフレーズを使用してデータをインポートすることは可能です。",
+    "Enter passphrase": "パスフレーズを入力",
+    "Confirm passphrase": "パスフレーズを確認",
+    "Export": "エクスポート",
+    "Import room keys": "ルームキーをインポートする",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "このプロセスでは、以前に別のMatrixクライアントからエクスポートした暗号化キーをインポートできます。 これにより、他のクライアントが解読できるすべてのメッセージを解読することができます。",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "エクスポートファイルはパスフレーズで保護されます。 ファイルを解読するには、パスフレーズをここに入力する必要があります。",
+    "File to import": "インポートするファイル",
+    "Import": "インポート",
+    "Failed to set direct chat tag": "直接チャットタグを設定できませんでした",
+    "Failed to remove tag %(tagName)s from room": "部屋からタグ %(tagName)s を削除できませんでした",
+    "Failed to add tag %(tagName)s to room": "部屋にタグ %(tagName)s を追加できませんでした",
+    "Open Devtools": "開発ツールを開く",
+    "bold": "bold",
+    "italic": "italic",
+    "underlined": "underlined",
+    "inline-code": "inline-code",
+    "block-quote": "block-quote",
+    "bulleted-list": "bulleted-list",
+    "numbered-list": "numbered-list",
+    "People": "人々",
+    "Flair": "フレア",
+    "Flair will not appear": "フレアは現れない",
+    "Fill screen": "フィルスクリーン",
+    "Light theme": "明るいテーマ",
+    "Dark theme": "暗いテーマ",
+    "Status.im theme": "Status.im テーマ"
 }

From f3aace1b3fd705c30cba29a94dbc23210ea56937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 8 Nov 2018 17:00:38 +0000
Subject: [PATCH 158/218] Translated using Weblate (French)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9958e51d16..ff90878bce 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1300,5 +1300,7 @@
     "Open Devtools": "Ouvrir les outils développeur",
     "Show developer tools": "Afficher les outils de développeur",
     "Pin unread rooms to the top of the room list": "Épingler les salons non lus en haut de la liste des salons",
-    "Pin rooms I'm mentioned in to the top of the room list": "Épingler les salons où l'on me mentionne en haut de la liste des salons"
+    "Pin rooms I'm mentioned in to the top of the room list": "Épingler les salons où l'on me mentionne en haut de la liste des salons",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "Si vous souhaitez créer un compte Matrix, vous pouvez <a>vous inscrire</a> maintenant.",
+    "You are currently using Riot anonymously as a guest.": "Vous utilisez Riot de façon anonyme en tant qu'invité."
 }

From b9ccdc4952da2ff1690db345f0f6ce6476830da1 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 8 Nov 2018 20:38:16 +0100
Subject: [PATCH 159/218] Align encrypted event buttons in Safari

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
---
 res/css/views/dialogs/_EncryptedEventDialog.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/res/css/views/dialogs/_EncryptedEventDialog.scss b/res/css/views/dialogs/_EncryptedEventDialog.scss
index 0dbaae24c1..58ed8b2527 100644
--- a/res/css/views/dialogs/_EncryptedEventDialog.scss
+++ b/res/css/views/dialogs/_EncryptedEventDialog.scss
@@ -24,5 +24,8 @@ limitations under the License.
     @mixin mx_DialogButton;
     background-color: $primary-bg-color;
     color: $accent-color;
+}
+
+.mx_EncryptedEventDialog button {
     margin-top: 0px;
 }

From 761f9d6336ba454fd0a5a46604f55a1b687b9d77 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 8 Nov 2018 20:07:45 +0000
Subject: [PATCH 160/218] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b777817c0a..9d0589bb17 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1300,5 +1300,7 @@
     "Open Devtools": "Fejlesztői eszközök megnyitása",
     "Show developer tools": "Fejlesztői eszközök megjelenítése",
     "Pin unread rooms to the top of the room list": "Nem olvasott üzeneteket tartalmazó szobák a szobalista elejére",
-    "Pin rooms I'm mentioned in to the top of the room list": "Megemlítéseket tartalmazó szobák a szobalista elejére"
+    "Pin rooms I'm mentioned in to the top of the room list": "Megemlítéseket tartalmazó szobák a szobalista elejére",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "Ha létre szeretnél hozni egy Matrix fiókot most <a>regisztrálhatsz</a>.",
+    "You are currently using Riot anonymously as a guest.": "A Riotot ismeretlen vendégként használod."
 }

From 8f7cab287ea61fd300846c62c4d3e2313820faab Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Fri, 9 Nov 2018 00:12:08 +0000
Subject: [PATCH 161/218] Translated using Weblate (Japanese)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 3a52fc59c7..e97eaa1ae2 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -384,7 +384,7 @@
     "VoIP conference started.": "VoIP会議が開始されました。",
     "VoIP conference finished.": "VoIP会議が終了しました。",
     "%(targetName)s rejected the invitation.": "%(targetName)s は招待を拒否しました。",
-    "%(targetName)s left the room.": "%(targetName)s は部屋を出ました。",
+    "%(targetName)s left the room.": "%(targetName)s は部屋を退出しました。",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s は %(targetName)s をブロック解除しました。",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s は %(targetName)s を追放しました。",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s は %(targetName)s の招待を撤回しました。",
@@ -846,18 +846,18 @@
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s が参加しました",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s が %(count)s 回参加しました",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s が参加しました",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUers)s が %(count)s 回退室しました",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s が退室しました",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s が %(count)s 回退室しました",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s が退室しました",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s が%(count)s 回参加し、退室した",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s が参加して退室しました",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s が %(count)s 回参加し退室しました",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s が参加し退室しました",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s が %(count)s 回退室し再参加しました",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s が退室し再参加しました",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s が %(count)s 回退室し再参加しました",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s が退室し再参加しました",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUers)s は %(count)s 回退出しました",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s は退出しました",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s は %(count)s 回退出しました",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s は退出しました",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s が%(count)s 回参加し、退出した",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s は参加して退出しました",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s が %(count)s 回参加し退出しました",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s が参加し退出しました",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s が %(count)s 回退出し再参加しました",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s が退出し再参加しました",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s が %(count)s 回退出し再参加しました",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s が退出し再参加しました",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s が %(count)s 回招待を拒否しました",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s が招待を拒否しました",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s が %(count)s 回招待を拒否しました",
@@ -966,7 +966,7 @@
     "Update any local room aliases to point to the new room": "新しいルームを指すようにローカルルームのエイリアスを更新する",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "古いバージョンの部屋でのユーザーの発言を停止し、新しい部屋に移動するようユーザーに通知するメッセージを投稿する",
     "Mention": "記載",
-    "Flair will appear if enabled in room settings": "部屋の設定で有効になると、Flairが表示されます",
+    "Flair will appear if enabled in room settings": "部屋の設定で有効になると、特色が表示されます",
     "Unverify": "未検証",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s が %(count)s 回招待を撤回した",
     "was unbanned %(count)s times|one": "ブロック解除されました",
@@ -1267,10 +1267,13 @@
     "bulleted-list": "bulleted-list",
     "numbered-list": "numbered-list",
     "People": "人々",
-    "Flair": "フレア",
-    "Flair will not appear": "フレアは現れない",
+    "Flair": "特色",
+    "Flair will not appear": "特色は現れない",
     "Fill screen": "フィルスクリーン",
     "Light theme": "明るいテーマ",
     "Dark theme": "暗いテーマ",
-    "Status.im theme": "Status.im テーマ"
+    "Status.im theme": "Status.im テーマ",
+    "Unignore": "無視しない",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "Matrixアカウントを作成したい場合は、今すぐ<a>登録する</a>ことができます。",
+    "You are currently using Riot anonymously as a guest.": "現在、Riotをゲストとして匿名で使用しています。"
 }

From 08cb18d9ca4aea1e27fe209f15d1c683428303d4 Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Fri, 9 Nov 2018 05:28:19 +0000
Subject: [PATCH 162/218] Translated using Weblate (Japanese)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index e97eaa1ae2..b5a03ae5dd 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -36,7 +36,7 @@
     "%(count)s new messages|one": "新しい発言 %(count)s",
     "%(count)s new messages|other": "新しい発言 %(count)s",
     "Don't send typing notifications": "文字入力中であることを公表しない",
-    "Filter room members": "参加者検索",
+    "Filter room members": "部屋メンバーのフィルタリング",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
     "Upload avatar": "アイコン画像を変更",
     "Upload file": "添付ファイル送信",
@@ -408,9 +408,9 @@
     "%(senderName)s ended the call.": "%(senderName)s は通話を終了しました。",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s は %(callType)s 電話をかけました。",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s は部屋に加わるよう %(targetDisplayName)s に招待状を送りました。",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s は、すべてのルームメンバーに招待された時点からの部屋履歴を参照できるようにしました。",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s は、すべての部屋のメンバーに参加した時点からの部屋履歴を参照できるようにしました。",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s は、すべての部屋メンバーに部屋履歴を参照できるようにしました。",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s は、部屋のメンバー全員に招待された時点からの部屋履歴を参照できるようにしました。",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s は、部屋のメンバー全員に参加した時点からの部屋履歴を参照できるようにしました。",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s は、部屋のメンバー全員に部屋履歴を参照できるようにしました。",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s は、部屋履歴を誰でも参照できるようにしました。",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s は 見知らぬ (%(visibility)s) に部屋履歴を参照できるようにしました。",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s はエンドツーエンドの暗号化をオンにしました (アルゴリズム %(algorithm)s)。",
@@ -438,7 +438,7 @@
     "Please contact your homeserver administrator.": "ホームサーバー管理者に連絡してください。",
     "Failed to join room": "部屋に参加できませんでした",
     "Message Pinning": "メッセージ留め",
-    "Increase performance by only loading room members on first view": "最初のビューではルームメンバーを読み込むだけにしてパフォーマンスを向上させる",
+    "Increase performance by only loading room members on first view": "最初のビューでは部屋のメンバーを読み込むだけにしてパフォーマンスを向上させる",
     "Disable Emoji suggestions while typing": "入力中に絵文字の候補を無効にする",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "参加/退出メッセージを非表示にする (招待/追放/ブロックは影響を受けない)",
     "Hide avatar changes": "アバター変更を隠す",
@@ -668,7 +668,7 @@
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "部屋の暗号化が有効になったら、(今のところ) もう一度電源を切ることはできません",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "暗号化されたメッセージは、まだ暗号化を実装していないクライアントでは表示されません",
     "Encryption is not enabled in this room": "この部屋では暗号化が有効になっていません",
-    "The default role for new room members is": "新しいルームメンバーのデフォルトの役割は次のとおり",
+    "The default role for new room members is": "新しい部屋メンバーの既定の役割は次のとおり",
     "To send messages, you must be a": "メッセージを送信するのに必要な権限",
     "To invite users into the room, you must be a": "ユーザーを会議室に招待するのに必要な権限",
     "To configure the room, you must be a": "部屋を設定するのに必要な権限",

From a050a0d55693f8bbab77d4e1b6911d0ba62c60c0 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Sat, 10 Nov 2018 15:30:07 +0000
Subject: [PATCH 163/218] Translated using Weblate (German)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 88667bdb0d..fffacf786e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1298,5 +1298,7 @@
     "Add some now": "Füge jetzt hinzu",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein Administrator dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem anderen Administrator eingeladen wirst.",
     "Open Devtools": "Öffne Entwickler-Werkzeuge",
-    "Show developer tools": "Zeige Entwickler-Werkzeuge"
+    "Show developer tools": "Zeige Entwickler-Werkzeuge",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "Wenn du ein Matrix-Konto erstellen möchtest, kannst du dich jetzt <a>registrieren</a>.",
+    "You are currently using Riot anonymously as a guest.": "Du benutzt aktuell Riot anonym als Gast."
 }

From cec9cc7d66d31295ff5b8e00f7986c8ddc520ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vasyl=CC=81=20V=2E=20Vercyns=CC=81kyj?= <fuckel@ukr.net>
Date: Sat, 10 Nov 2018 14:01:27 +0000
Subject: [PATCH 164/218] Translated using Weblate (Ukrainian)

Currently translated at 40.5% (518 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 222 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 207 insertions(+), 15 deletions(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index b36642691c..e38fb27414 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -23,8 +23,8 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Текстове повідомлення було надіслано +%(msisdn)s. Введіть, будь ласка, код підтвердження з цього повідомлення",
     "Accept": "Прийняти",
     "Account": "Обліковка",
-    "%(targetName)s accepted an invitation.": "%(targetName)s прийняв запрошення.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прийняв запрошення від %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s прийняв/ла запрошення.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "Запрошення від %(displayName)s прийнято %(targetName)s.",
     "Access Token:": "Токен доступу:",
     "Active call (%(roomName)s)": "Активний виклик (%(roomName)s)",
     "Add": "Додати",
@@ -57,7 +57,7 @@
     "A new password must be entered.": "Має бути введений новий пароль.",
     "Add a widget": "Добавити віджет",
     "Allow": "Принюти",
-    "%(senderName)s answered the call.": "%(senderName)s відповіла на дзвінок.",
+    "%(senderName)s answered the call.": "%(senderName)s відповів/ла на дзвінок.",
     "An error has occurred.": "Трапилась помилка.",
     "Anyone": "Кожний",
     "Anyone who knows the room's link, apart from guests": "Кожний, хто знає посилання на кімнату, окрім гостей",
@@ -68,10 +68,10 @@
     "Are you sure you want to upload the following files?": "Ви впевнені, що ви хочете відправити наступний файл?",
     "Attachment": "Прикріплення",
     "Autoplay GIFs and videos": "Автовідтворення GIF і відео",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокував(ла) %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокував/ла %(targetName)s.",
     "Ban": "Заблокувати",
     "Banned users": "Заблоковані користувачі",
-    "Bans user with given id": "Блокує користувача з заданим ID",
+    "Bans user with given id": "Блокує користувача з вказаним ID",
     "Blacklisted": "В чорному списку",
     "Bulk Options": "Групові параметри",
     "Call Timeout": "Час очікування виклика",
@@ -79,22 +79,22 @@
     "Can't load user settings": "Неможливо завантажити настройки користувача",
     "Cannot add any more widgets": "Неможливо додати більше віджетів",
     "Change Password": "Поміняти пароль",
-    "%(senderName)s changed their profile picture.": "%(senderName)s змінив зображення профіля.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s змінив/ла зображення профілю.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінив(ла) рівень доступу для %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив(ла) назву кімнати на %(roomName)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив/ла назву кімнати на %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s видалив ім'я кімнати.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінив тему на %(topic)s.",
     "Email": "е-пошта",
     "Email address": "Адреса е-почти",
     "Email address (optional)": "Адреса е-почти (не обов'язково)",
-    "Email, name or matrix ID": "Е-почта, ім'я або matrix ID",
+    "Email, name or matrix ID": "Електронна пошта, ім'я або matrix ID",
     "Failed to send email": "Помилка відправки  е-почти",
     "Edit": "Редактувати",
     "Unpin Message": "Відкріпити повідомлення",
-    "Register": "Зарегіструватись",
+    "Register": "Зареєструватися",
     "Rooms": "Кімнати",
     "Add rooms to this community": "Добавити кімнати в це суспільство",
-    "This email address is already in use": "Ця е-пошта вже використовується",
+    "This email address is already in use": "Ця електронна пошта вже використовується",
     "This phone number is already in use": "Цей телефонний номер вже використовується",
     "Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування",
     "Messages in one-to-one chats": "Повідомлення у чатах \"сам на сам\"",
@@ -267,10 +267,10 @@
     "The version of Riot.im": "Версія Riot.im",
     "Whether or not you're logged in (we don't record your user name)": "Чи увійшли ви, чи ні (ми не зберігаємо ваше ім'я користувача)",
     "Your language of choice": "Обрана мова",
-    "Which officially provided instance you are using, if any": "Яким офіційно наданим примірником ви користуєтесь (якщо користуєтесь)",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Чи використовуєте ви режим Richtext у редакторі Rich Text Editor",
-    "Your homeserver's URL": "URL адреса вашого домашнього серверу",
-    "Failed to verify email address: make sure you clicked the link in the email": "Не вдалось перевірити адресу е-пошти: переконайтесь, що ви перейшли за посиланням у листі",
+    "Which officially provided instance you are using, if any": "Яким офіційно наданим клієнтом ви користуєтесь (якщо користуєтесь)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Чи використовуєте ви режим форматованого тексту у редакторі Rich Text Editor",
+    "Your homeserver's URL": "URL адреса вашого домашнього сервера",
+    "Failed to verify email address: make sure you clicked the link in the email": "Не вдалось перевірити адресу електронної пошти: переконайтесь, що ви перейшли за посиланням у листі",
     "The platform you're on": "Використовувана платформа",
     "Your identity server's URL": "URL адреса серверу ідентифікації",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
@@ -329,5 +329,197 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s, %(day)s, %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s, %(day)s, %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
-    "Who would you like to add to this community?": "Кого ви хочете додати до цієї спільноти?"
+    "Who would you like to add to this community?": "Кого ви хочете додати до цієї спільноти?",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Якщо сторінка містить ідентифікаційну інформацію, як то ідентифікатор кімнати, користувача чи групи, ці дані будуть вилучені перед надсиланням на сервер.",
+    "Could not connect to the integration server": "Неможливо приєднатися до інтеграційного сервера",
+    "A conference call could not be started because the intgrations server is not available": "Неможливо здійснити дзвінок-конференцію, оскільки інтеграційний сервер недоступний",
+    "Call in Progress": "Іде виклик",
+    "A call is currently being placed!": "Зараз іде виклик!",
+    "A call is already in progress!": "Вже здійснюється дзвінок!",
+    "Permission Required": "Потрібен дозвіл",
+    "You do not have permission to start a conference call in this room": "У вас немає дозволу, щоб розпочати дзвінок-конференцію в цій кімнаті",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Зверніть увагу: будь-яка людина, яку ви додаєте до спільноти, буде публічно видимою тим, хто знає ідентифікатор спільноти",
+    "Invite new community members": "Запросити до спільноти",
+    "Name or matrix ID": "Ім'я або ідентифікатор matrix",
+    "Invite to Community": "Запросити до спільноти",
+    "Which rooms would you like to add to this community?": "Які кімнати ви хочете додати до цієї спільноти?",
+    "Show these rooms to non-members on the community page and room list?": "Показувати ці кімнати тим, хто не належить до спільноти, на сторінці спільноти та списку кімнат?",
+    "Add rooms to the community": "Додати кімнати до спільноти",
+    "Room name or alias": "Назва або псевдонім кімнати",
+    "Add to community": "Додати до спільноти",
+    "Failed to invite the following users to %(groupId)s:": "Не вдалося запросити таких користувачів до %(groupId)s:",
+    "Failed to invite users to community": "Не вдалося запросити користувачів до кімнати",
+    "Failed to invite users to %(groupId)s": "Не вдалося запросити користувачів до %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Не вдалося додати такі кімнати до %(groupId)s:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot не має дозволу надсилати вам сповіщення — будь ласка, перевірте налаштування переглядача",
+    "Riot was not given permission to send notifications - please try again": "Riot не має дозволу надсилати сповіщення — будь ласка, спробуйте ще раз",
+    "Unable to enable Notifications": "Не вдалося увімкнути сповіщення",
+    "This email address was not found": "Не знайдено адресу електронної пошти",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Схоже, ваша адреса електронної пошти не пов'язана з жодним ідентифікатор Matrix на цьому домашньому сервері.",
+    "Registration Required": "Потрібна реєстрація",
+    "You need to register to do this. Would you like to register now?": "Вам потрібно зареєструватися, щоб це зробити. Бажаєте зареєструватися зараз?",
+    "Restricted": "Обмежено",
+    "Moderator": "Модератор",
+    "Start a chat": "Розпочати балачку",
+    "Who would you like to communicate with?": "З ким бажаєте спілкуватися?",
+    "Start Chat": "Розпочати балачку",
+    "Invite new room members": "Запросити до кімнати",
+    "Who would you like to add to this room?": "Кого бажаєте додати до цієї кімнати?",
+    "Send Invites": "Надіслати запрошення",
+    "Failed to invite user": "Не вдалося запросити користувача",
+    "Failed to invite": "Не вдалося запросити",
+    "Failed to invite the following users to the %(roomName)s room:": "Не вдалося запросити таких користувачів до кімнати %(roomName)s:",
+    "You need to be logged in.": "Вам потрібно увійти.",
+    "You need to be able to invite users to do that.": "Щоб це зробити, вам необхідно мати можливість запрошувати людей.",
+    "Unable to create widget.": "Неможливо створити віджет.",
+    "Missing roomId.": "Бракує ідентифікатора кімнати.",
+    "Failed to send request.": "Не вдалося надіслати запит.",
+    "This room is not recognised.": "Кімнату не знайдено.",
+    "Power level must be positive integer.": "Рівень прав мусить бути додатнім цілим числом.",
+    "You are not in this room.": "Вас немає в цій кімнаті.",
+    "You do not have permission to do that in this room.": "У вас немає прав виконувати для цього в цій кімнаті.",
+    "Missing room_id in request": "У запиті бракує room_id",
+    "Room %(roomId)s not visible": "Кімната %(roomId)s не видима",
+    "Missing user_id in request": "У запиті пропущено user_id",
+    "Usage": "Використання",
+    "Searches DuckDuckGo for results": "Здійснює пошук через DuckDuckGo",
+    "/ddg is not a command": "/ddg — це не команда",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Щоб цим скористатися, просто почекайте на підказки доповнення й перемикайтеся між ними клавішею TAB.",
+    "Changes your display nickname": "Змінює ваш нік",
+    "Changes colour scheme of current room": "Змінює кольорову схему кімнати",
+    "Sets the room topic": "Встановлює тему кімнати",
+    "Invites user with given id to current room": "Запрошує користувача з вказаним ідентифікатором до кімнати",
+    "Joins room with given alias": "Приєднується до кімнати з поданим ідентифікатором",
+    "Leave room": "Покинути кімнату",
+    "Unrecognised room alias:": "Кімнату не знайдено:",
+    "Kicks user with given id": "Викинути з кімнати користувача з вказаним ідентифікатором",
+    "Unbans user with given id": "Розблоковує користувача з вказаним ідентифікатором",
+    "Ignores a user, hiding their messages from you": "Ігнорувати користувача (приховує повідомлення від них)",
+    "Ignored user": "Користувача ігноровано",
+    "You are now ignoring %(userId)s": "Ви ігноруєте %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "Припинити ігнорувати користувача (показує їхні повідомлення від цього моменту)",
+    "Unignored user": "Припинено ігнорування користувача",
+    "You are no longer ignoring %(userId)s": "Ви більше не ігноруєте %(userId)s",
+    "Define the power level of a user": "Вказати рівень прав користувача",
+    "Deops user with given id": "Знімає права оператора з користувача з вказаним ідентифікатором",
+    "Opens the Developer Tools dialog": "Відкриває вікно інструментів розробника",
+    "Verifies a user, device, and pubkey tuple": "Перевіряє комбінацію користувача, пристрою і публічного ключа",
+    "Unknown (user, device) pair:": "Невідома комбінація користувача і пристрою:",
+    "Device already verified!": "Пристрій вже перевірено!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "УВАГА: Пристрій уже перевірено, але ключі НЕ ЗБІГАЮТЬСЯ!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "УВАГА: КЛЮЧ НЕ ПРОЙШОВ ПЕРЕВІРКУ! Підписний ключ %(userId)s на пристрої %(deviceId)s — це «%(fprint)s», і він не збігається з наданим ключем «%(fingerprint)s». Це може означати, що ваші повідомлення перехоплюють!",
+    "Verified key": "Ключ перевірено",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Підписний ключ, який ви вказали, збігається з підписним ключем, отриманим від пристрою %(deviceId)s користувача %(userId)s. Пристрій позначено як перевірений.",
+    "Displays action": "Показує дію",
+    "Unrecognised command:": "Невідома команда:",
+    "Reason": "Причина",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s бажає розпочати дзвінок-конференцію.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s запросив/ла %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s змінив/ла своє видиме ім'я на %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s вказав/ла своє видиме ім'я: %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ліквідував/ла своє видиме ім'я (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s вилучав/ла свою світлину профілю.",
+    "%(senderName)s set a profile picture.": "%(senderName)s встановив/ла світлину профілю.",
+    "VoIP conference started.": "Розпочато дзвінок-конференцію.",
+    "%(targetName)s joined the room.": "%(targetName)s приєднав/лася до кімнати.",
+    "VoIP conference finished.": "Дзвінок-конференцію завершено.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s відкинув/ла запрошення.",
+    "%(targetName)s left the room.": "%(targetName)s залишив/ла кімнату.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s розблокував/ла %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s викинув/ла %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s відкликав/ла запрошення %(targetName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s надіслав/ла зображення.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s додав/ла %(addedAddresses)s як адреси цієї кімнати.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s додав/ла %(addedAddresses)s як адресу цієї кімнати.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s вилучив/ла %(removedAddresses)s з адрес цієї кімнати.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s вилучив/ла %(removedAddresses)s з адрес цієї кімнати.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s додав/ла %(addedAddresses)s і вилучив/ла %(removedAddresses)s з адрес цієї кімнати.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s призначив/ла основну адресу цієї кімнати: %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s вилучив/ла основу адресу цієї кімнати.",
+    "Someone": "Хтось",
+    "(not supported by this browser)": "(не підтримується цією веб-переглядачкою)",
+    "(could not connect media)": "(не можливо під'єднати медіа)",
+    "(no answer)": "(немає відповіді)",
+    "(unknown failure: %(reason)s)": "(невідома помилка: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s завершив/ла дзвінок.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ініціював/ла дзвінок %(callType)s.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s надіслав/ла запрошення %(targetDisplayName)s приєднатися до кімнати.",
+    "Show developer tools": "Показати інструменти розробки",
+    "Default": "Типово",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s зробив/ла майбутню історію кімнати видимою для всіх учасників, з моменту, коли вони приєдналися.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s зробив/ла майбутню історію кімнати видимою для всіх учасників, з моменту, коли вони приєдналися.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s зробив/ла майбутню історію видимою для всіх учасників кімнати.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s зробив/ла майбутню історію кімнати видимою для всіх.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s зробив/ла майбутню історію видимою невідомим (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s увімкнув/ла наскрізне шифрування (алгоритм %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s з %(fromPowerLevel)s до %(toPowerLevel)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s змінив/ла прикріплені повідомлення для кімнати.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s змінив/ла %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s додав/ла %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучив/ла %(widgetName)s",
+    "%(displayName)s is typing": "%(displayName)s пише",
+    "%(names)s and %(count)s others are typing|other": "%(names)s і %(count)s пишуть",
+    "%(names)s and %(count)s others are typing|one": "%(names)s та ще одна особа пишуть",
+    "Failure to create room": "Не вдалося створити кімнату",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Сервер може бути недоступний, перевантажений, або ж ви натрапили на ваду.",
+    "Send anyway": "Все-таки надіслати",
+    "Unnamed Room": "Кімната без назви",
+    "This homeserver has hit its Monthly Active User limit.": "Цей домашній сервер досягнув свого ліміту щомісячних активних користувачів.",
+    "This homeserver has exceeded one of its resource limits.": "Цей домашній сервер досягнув одного зі своїх лімітів ресурсів.",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Будь ласка, <a>зв'яжіться з адміністратором вашого сервісу</a>, щоб продовжити користуватися цим сервісом.",
+    "Unable to connect to Homeserver. Retrying...": "Не вдається приєднатися до домашнього сервера. Повторення спроби...",
+    "Your browser does not support the required cryptography extensions": "Ваша веб-переглядачка не підтримує необхідних криптографічних функцій",
+    "Not a valid Riot keyfile": "Файл ключа Riot некоректний",
+    "Authentication check failed: incorrect password?": "Помилка автентифікації: неправильний пароль?",
+    "Sorry, your homeserver is too old to participate in this room.": "Вибачте, ваш домашній сервер занадто старий, щоб приєднатися до цієї кімнати.",
+    "Please contact your homeserver administrator.": "Будь ласка, зв'яжіться з адміністратором вашого домашнього сервера.",
+    "Failed to join room": "Не вдалося приєднатися до кімнати",
+    "Message Pinning": "Прикріплені повідомлення",
+    "Increase performance by only loading room members on first view": "Покращити швидкодію, завантажуючи список учасників кімнати лише при першому перегляді",
+    "Disable Emoji suggestions while typing": "Вимкнути підказки емоційок під час писання",
+    "Use compact timeline layout": "Використовувати компактну розкладку стрічки",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Приховувати повідомлення про приєднання/вихід (не стосується запрошень, викидань і блокувань)",
+    "Hide avatar changes": "Приховувати зміни аватарів",
+    "Hide display name changes": "Приховувати зміни видимих імен",
+    "Hide read receipts": "Приховувати сповіщення про прочитання",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показувати час у 12-годинному форматі (напр. 2:30 pm)",
+    "Always show encryption icons": "Завжди показувати значки шифрування",
+    "Enable automatic language detection for syntax highlighting": "Показувати автоматичне визначення мови для підсвічування синтаксису",
+    "Hide avatars in user and room mentions": "Приховувати аватари у згадках користувачів і кімнат",
+    "Disable big emoji in chat": "Вимкнути великі емоційки в балачці",
+    "Don't send typing notifications": "Не надсилати сповіщення «пишу»",
+    "Automatically replace plain text Emoji": "Автоматично замінювати емоційки в простому тексті",
+    "Mirror local video feed": "Показувати локальне відео віддзеркалено",
+    "Disable Community Filter Panel": "Вимкнути панель фільтру спільнот",
+    "Disable Peer-to-Peer for 1:1 calls": "Вимкнути peer-to-peer для дзвінків 1:1",
+    "Send analytics data": "Надсилати дані аналітики",
+    "Never send encrypted messages to unverified devices from this device": "Ніколи не надсилати шифрованих повідомлень до неперевірених пристроїв з цього пристрою",
+    "Never send encrypted messages to unverified devices in this room from this device": "Ніколи не надсилати шифрованих повідомлень до неперевірених пристроїв у цій кімнаті з цього пристрою",
+    "Enable inline URL previews by default": "Увімкнути вбудований перегляд гіперпосилань за умовчанням",
+    "Enable URL previews for this room (only affects you)": "Увімкнути попередній перегляд гіперпосилань в цій кімнаті (стосується тільки вас)",
+    "Enable URL previews by default for participants in this room": "Увімкнути попередній перегляд гіперпосилань за умовчанням для учасників цієї кімнати",
+    "Room Colour": "Колір кімнати",
+    "Pin unread rooms to the top of the room list": "Прикріпити кімнати з непрочитаними повідомленнями на початку списку",
+    "Pin rooms I'm mentioned in to the top of the room list": "Прикріпити кімнати, у яких мене згадували, на початку списку",
+    "Incoming voice call from %(name)s": "Вхідний дзвінок від %(name)s",
+    "Incoming video call from %(name)s": "Вхідний відеодзвінок від %(name)s",
+    "Incoming call from %(name)s": "Вхідний дзвінок від %(name)s",
+    "Decline": "Відхилити",
+    "Incorrect verification code": "Неправильний код перевірки",
+    "Enter Code": "Вкажіть код",
+    "Submit": "Надіслати",
+    "Phone": "Телефон",
+    "Failed to upload profile picture!": "Не вдалося завантажити світлину профілю!",
+    "Upload new:": "Завантажити нову:",
+    "No display name": "Немає імені для показу",
+    "New passwords don't match": "Нові паролі не збігаються",
+    "Passwords can't be empty": "Пароль не може бути пустим",
+    "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Зміна пароля поки що також скидає ключі наскрізного шифрування на всіх пристроях, внаслідок чого шифрована історія балачки стає недоступною, якщо ви не експортуєте ключі шифрування кімнат і не імпортуєте їх після зміни пароля. У майбутньому це буде поліпшено.",
+    "Export E2E room keys": "Експортувати ключі наскрізного шифрування кімнат",
+    "Do you want to set an email address?": "Бажаєте вказати адресу електронної пошти?",
+    "Current password": "Поточний пароль",
+    "Password": "Пароль",
+    "New Password": "Новий пароль",
+    "Confirm password": "Підтвердження пароля",
+    "Your home server does not support device management.": "Ваш домашній сервер не підтримує керування пристроями."
 }

From df0bdabb8368ee16cd17ec59afb8f1096f1a0e42 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 11 Nov 2018 11:46:07 +0000
Subject: [PATCH 165/218] Translated using Weblate (Basque)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
---
 src/i18n/strings/eu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 6eaf55259e..1c9c07d305 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1298,5 +1298,7 @@
     "Open Devtools": "Ireki garapen tresnak",
     "Show developer tools": "Erakutsi garapen tresnak",
     "Pin unread rooms to the top of the room list": "Finkatu irakurri gabeko gelak gelen zerrendaren goialdean",
-    "Pin rooms I'm mentioned in to the top of the room list": "Finkatu aipatu nauten gelak gelen zerrendaren goialdean"
+    "Pin rooms I'm mentioned in to the top of the room list": "Finkatu aipatu nauten gelak gelen zerrendaren goialdean",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "Matrix kontu bat sortu nahi baduzu, <a>izena eman</a> dezakezu.",
+    "You are currently using Riot anonymously as a guest.": "Riot anonimoki gonbidatu gisa erabiltzen ari zara."
 }

From 8a4fb3cb2f1b36ed54f813b78af2a6a7778b27dd Mon Sep 17 00:00:00 2001
From: toriko <liberaknabino@protonmail.com>
Date: Mon, 12 Nov 2018 13:42:12 +0000
Subject: [PATCH 166/218] Translated using Weblate (Japanese)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index b5a03ae5dd..5efc66f42e 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -65,7 +65,7 @@
     "Unpin Message": "メッセージの固定を外す",
     "Online": "オンライン",
     "unknown error code": "不明なエラーコード",
-    "Failed to forget room %(errCode)s": "部屋の記憶を消すのに失敗しました %(errCode)s",
+    "Failed to forget room %(errCode)s": "部屋の履歴を消すのに失敗しました %(errCode)s",
     "Register": "登録",
     "Rooms": "部屋",
     "Add rooms to this community": "このコミュニティに部屋を追加する",
@@ -764,7 +764,7 @@
     "To continue, please enter your password.": "続行するには、パスワードを入力してください。",
     "Password:": "パスワード:",
     "Please review and accept the policies of this homeserver:": "このホームサーバーのポリシーを確認し、同意してください:",
-    "An email has been sent to %(emailAddress)s": "電子メールが %(emailAddress)s に送信されました。",
+    "An email has been sent to %(emailAddress)s": "電子メールが %(emailAddress)s に送信されました",
     "Please check your email to continue registration.": "登録を続行するにはメールをご確認ください。",
     "Token incorrect": "間違ったトークン",
     "A text message has been sent to %(msisdn)s": "テキストメッセージが %(msisdn)s に送信されました",
@@ -904,7 +904,7 @@
     "Matrix Room ID": "Matrix 部屋ID",
     "email address": "メールアドレス",
     "You have entered an invalid address.": "無効なアドレスを入力しました。",
-    "Try using one of the following valid address types: %(validTypesList)s.": "次の有効なアドレスタイプのいずれかを使用してください。%(validTypesList)s",
+    "Try using one of the following valid address types: %(validTypesList)s.": "次の有効なアドレスタイプのいずれかを使用してください：%(validTypesList)s",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "ログを送信する前に、問題を説明するために<a>GitHubに論点を作成する</a>必要があります。",
     "What GitHub issue are these logs for?": "これらのログはどのGitHubの問題ですか?",
     "Create a new chat or reuse an existing one": "新しいチャットを作成するか、既存のチャットを再利用する",
@@ -1037,7 +1037,7 @@
     "Who would you like to add to this summary?": "この要約に誰を追加しますか?",
     "Failed to add the following users to the summary of %(groupId)s:": "%(groupId)s のサマリーに次のユーザーを追加できませんでした。",
     "Add a User": "ユーザーを追加",
-    "Failed to remove a user from the summary of %(groupId)s": "%(groupId)s のサマリーからユーザーを削除できませんでした。",
+    "Failed to remove a user from the summary of %(groupId)s": "%(groupId)s のサマリーからユーザーを削除できませんでした",
     "The user '%(displayName)s' could not be removed from the summary.": "ユーザー '%(displayName)s' をサマリーから削除できませんでした。",
     "Failed to upload image": "画像のアップロードに失敗しました",
     "Failed to update community": "コミュニティの更新に失敗しました",

From ed663ef654455399a97a8c11c6392ca78d2500d0 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 13 Nov 2018 09:32:21 +0000
Subject: [PATCH 167/218] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4c390cfade..246d53c8d2 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1297,5 +1297,7 @@
     "Joining room...": "Влизане в стая...",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Вие сте администратор на тази общност. Няма да можете да се присъедините пак без покана от друг администратор.",
     "Open Devtools": "Отвори инструментите за разработчици",
-    "Show developer tools": "Покажи инструментите за разработчици"
+    "Show developer tools": "Покажи инструментите за разработчици",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "Ако искате да създадете Matrix акаунт, може да се <a>регистрирате</a> тук.",
+    "You are currently using Riot anonymously as a guest.": "В момента използвате Riot анонимно, като гост."
 }

From 9226548306200bec76869901d6c1f82878dcd76d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 13 Nov 2018 17:57:26 +0000
Subject: [PATCH 168/218] Prepare changelog for v0.14.3

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dae09ee2f1..857a2d4bba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.14.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.3) (2018-11-13)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.2...v0.14.3)
+
+ * Add banner with login/register links for users who aren't logged in
+
 Changes in [0.14.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.2) (2018-10-29)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.2-rc.1...v0.14.2)

From 3f8a3f761df6e9de895ac56f7edd22dc51e90f17 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 13 Nov 2018 17:57:26 +0000
Subject: [PATCH 169/218] v0.14.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7d5af70dc3..9bab6dd9cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From a539667438870b6a158d48474589240cc7378327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= <ciaranainsworth@outlook.com>
Date: Sat, 10 Nov 2018 16:12:42 +0000
Subject: [PATCH 170/218] Translated using Weblate (English (United States))

Currently translated at 68.1% (870 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
---
 src/i18n/strings/en_US.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 7c8e632e84..aa7140aaa8 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -872,5 +872,13 @@
     "Add to community": "Add to community",
     "Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
     "Failed to invite users to community": "Failed to invite users to community",
-    "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s"
+    "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Registration Required": "Registration Required",
+    "You need to register to do this. Would you like to register now?": "You need to register to do this. Would you like to register now?",
+    "Restricted": "Restricted",
+    "Missing roomId.": "Missing roomId.",
+    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Forces the current outbound group session in an encrypted room to be discarded",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s."
 }

From 77cdad58efed0b5030f5b5a62caf56f60484e8a5 Mon Sep 17 00:00:00 2001
From: Suetsugu Kawamura <skawamura@seijin.org>
Date: Tue, 13 Nov 2018 01:41:30 +0000
Subject: [PATCH 171/218] Translated using Weblate (Japanese)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 5efc66f42e..fb4e384819 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -36,7 +36,7 @@
     "%(count)s new messages|one": "新しい発言 %(count)s",
     "%(count)s new messages|other": "新しい発言 %(count)s",
     "Don't send typing notifications": "文字入力中であることを公表しない",
-    "Filter room members": "部屋メンバーのフィルタリング",
+    "Filter room members": "部屋メンバーの絞り込み",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
     "Upload avatar": "アイコン画像を変更",
     "Upload file": "添付ファイル送信",
@@ -117,7 +117,7 @@
     "Failed to change settings": "設定の変更に失敗しました",
     "Mentions only": "呼び掛けられた時のみ",
     "Collecting app version information": "アプリのバージョン情報を収集",
-    "Filter room names": "部屋名検索",
+    "Filter room names": "部屋名の絞り込み",
     "Changelog": "変更履歴",
     "Invite to this room": "この部屋へ招待",
     "Waiting for response from server": "サーバからの応答を待っています",
@@ -176,7 +176,7 @@
     "You have successfully set a password!": "パスワードの設定に成功しました！",
     "Explore Room State": "部屋の状態を調べる",
     "Source URL": "ソースのURL",
-    "Filter results": "フィルター結果",
+    "Filter results": "絞り込み結果",
     "Noisy": "音量大",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "部屋のエイリアス %(alias)s を削除し、ディレクトリから %(name)s を消去しますか？",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "これにより、サインアウト後にあなたのアカウントに戻る、また、他の端末でサインインすることができます。",
@@ -797,7 +797,7 @@
     "Remove this user from community?": "コミュニティからこのユーザーを削除しますか?",
     "Failed to withdraw invitation": "招待を撤回できませんでした",
     "Failed to remove user from community": "コミュニティからユーザーを削除できませんでした",
-    "Filter community members": "コミュニティメンバーをフィルタリングする",
+    "Filter community members": "コミュニティメンバーを絞り込む",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "%(roomName)s を %(groupId)s から削除してもよろしいですか?",
     "Removing a room from the community will also remove it from the community page.": "コミュニティから部屋を削除すると、コミュニティページからもその部屋が削除されます。",
     "Failed to remove room from community": "コミュニティからの部屋の削除に失敗しました",
@@ -807,7 +807,7 @@
     "Visibility in Room List": "ルームリストの可視性",
     "Visible to everyone": "みんなに見える",
     "Only visible to community members": "コミュニティメンバーにのみ表示されます",
-    "Filter community rooms": "コミュニティルームをフィルタリングする",
+    "Filter community rooms": "コミュニティルームを絞り込む",
     "Something went wrong when trying to get your communities.": "コミュニティに参加しようとすると何かがうまくいかなかった。",
     "Display your community flair in rooms configured to show it.": "それを表示するように構成された部屋にコミュニティの特色を表示します。",
     "Show developer tools": "開発者ツールを表示",
@@ -1080,7 +1080,7 @@
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riotの古いバージョンのデータが検出されました。 これにより、古いバージョンではエンドツーエンドの暗号化が機能しなくなります。 古いバージョンを使用している間に最近交換されたエンドツーエンドの暗号化されたメッセージは、このバージョンでは復号化できません。 これにより、このバージョンで交換されたメッセージが失敗することもあります。 問題が発生した場合は、ログアウトして再度ログインしてください。 メッセージ履歴を保持するには、キーをエクスポートして再インポートします。",
     "Logout": "ログアウト",
     "Your Communities": "あなたのコミュニティ",
-    "Did you know: you can use communities to filter your Riot.im experience!": "知っていましたか: コミュニティを使ってRiot.imの経験をフィルタリングすることができます！",
+    "Did you know: you can use communities to filter your Riot.im experience!": "知っていましたか: コミュニティを使ってRiot.imの経験を絞り込むことができます！",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "フィルターを設定するには、画面左側のフィルターパネルへコミュニティアバターをドラッグします。フィルタパネルのアバターをクリックすると、そのコミュニティに関連付けられた部屋や人だけが表示されます。",
     "Error whilst fetching joined communities": "参加したコミュニティを取得中にエラーが発生しました",
     "Create a new community": "新しいコミュニティを作成する",

From 42acd7ea28fb25c9e99bfb1aa36bb79c567efe3c Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Mon, 12 Nov 2018 13:46:01 +0000
Subject: [PATCH 172/218] Translated using Weblate (Swedish)

Currently translated at 99.6% (1271 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 4a3c81774a..c0ce097a91 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1267,5 +1267,28 @@
     "You need to register to do this. Would you like to register now?": "Du måste registrera dig för att göra detta. Vill du registrera dig nu?",
     "Forces the current outbound group session in an encrypted room to be discarded": "Tvingar den aktuella utgående gruppsessionen i ett krypterat rum att överges",
     "Unable to connect to Homeserver. Retrying...": "Det gick inte att ansluta till hemserver. Försöker igen ...",
-    "Unable to query for supported registration methods": "Det gick inte att hämta stödda registreringsmetoder"
+    "Unable to query for supported registration methods": "Det gick inte att hämta stödda registreringsmetoder",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s satte huvudadressen för detta rum till %(address)s.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s lade till %(addedAddresses)s som adresser för detta rum.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s lade till %(addedAddresses)s som adress för detta rum.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s tog bort %(removedAddresses)s som adresser för detta rum.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s tog bort %(removedAddresses)s som adress för detta rum.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s lade till %(addedAddresses)s och tog bort %(removedAddresses)s som adresser för detta rum.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s tog bort huvudadressen för detta rum.",
+    "Pin unread rooms to the top of the room list": "Nåla fast olästa rum längst upp i rumslistan",
+    "Pin rooms I'm mentioned in to the top of the room list": "Nåla fast rum jag nämns i längst upp i rumslistan",
+    "Joining room...": "Går med i rum...",
+    "Add some now": "Lägg till några nu",
+    "Please review and accept the policies of this homeserver:": "Granska och acceptera policyn för denna hemserver:",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Innan du skickar in loggar måste du <a>skapa en GitHub-bugg</a> för att beskriva problemet.",
+    "What GitHub issue are these logs for?": "Vilken GitHub-bugg är dessa loggar för?",
+    "Updating Riot": "Uppdaterar Riot",
+    "Submit Debug Logs": "Skicka felsökningsloggar",
+    "An email address is required to register on this homeserver.": "En epostadress krävs för att registrera sig på denna hemserver.",
+    "A phone number is required to register on this homeserver.": "Ett telefonnummer krävs för att registrera sig på denna hemserver.",
+    "Open Devtools": "Öppna Devtools",
+    "Show developer tools": "Visa utvecklingsverktyg",
+    "You are currently using Riot anonymously as a guest.": "Du använder för närvarande Riot anonymt som gäst.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du är administratör för denna community. Du kommer inte kunna gå med igen utan en inbjudan från en annan administratör.",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "Om du vill skapa ett Matrix-konto kan du <a>registrera dig</a> nu."
 }

From 5a4e22558f67840cad10154292c1626e65a9fa26 Mon Sep 17 00:00:00 2001
From: Yuriy Bulka <setthemfree@privacyrequired.com>
Date: Sun, 11 Nov 2018 11:05:41 +0000
Subject: [PATCH 173/218] Translated using Weblate (Ukrainian)

Currently translated at 44.5% (569 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 53 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index e38fb27414..2f3f563f0d 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -521,5 +521,56 @@
     "Password": "Пароль",
     "New Password": "Новий пароль",
     "Confirm password": "Підтвердження пароля",
-    "Your home server does not support device management.": "Ваш домашній сервер не підтримує керування пристроями."
+    "Your home server does not support device management.": "Ваш домашній сервер не підтримує керування пристроями.",
+    "Unable to load device list": "Не вдалося завантажити перелік пристроїв",
+    "Delete %(count)s devices|other": "Вилучити %(count)s пристроїв",
+    "Delete %(count)s devices|one": "Вилучити пристрій",
+    "Device ID": "ID пристрою",
+    "Device Name": "Назва пристрою",
+    "Last seen": "Востаннє з'являвся",
+    "Select devices": "Вибрати пристрої",
+    "Failed to set display name": "Не вдалося встановити ім'я для показу",
+    "Disable Notifications": "Вимкнути сповіщення",
+    "Enable Notifications": "Увімкнути сповіщення",
+    "The maximum permitted number of widgets have already been added to this room.": "Максимально дозволену кількість віджетів уже додано до цієї кімнати.",
+    "Drop File Here": "Киньте файл сюди",
+    "Drop file here to upload": "Киньте файл сюди, щоб вивантажити",
+    " (unsupported)": " (не підтримується)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Приєднатися <voiceText>голосом</voiceText> або <videoText>відео</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Триває дзвінок-конференція%(supportedText)s.",
+    "This event could not be displayed": "Неможливо показати цю подію",
+    "%(senderName)s sent an image": "%(senderName)s надіслав/ла зображення",
+    "%(senderName)s sent a video": "%(senderName)s надіслав/ла відео",
+    "%(senderName)s uploaded a file": "%(senderName)s надіслав/ла файл",
+    "Options": "Налаштування",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Ваш запит поширення ключа надіслано — гляньте запити поширення ключа на своїх інших пристроях.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Запити поширення ключа надсилаються на ваші пристрої автоматично. Якщо ви відкинули запит поширення ключа на своїх інших пристроях, натисніть тут, щоб наново надіслати запит поширення ключа для цього сеансу.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Якщо на ваших інших пристроях немає ключа для цього повідомлення, ви не зможете його прочитати.",
+    "Key request sent.": "Запит ключа надіслано.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Наново надіслати запит ключів шифрування</requestLink> на ваші інші пристрої.",
+    "Undecryptable": "Неможливо розшифрувати",
+    "Encrypting": "Шифрування",
+    "Encrypted, not sent": "Зашифровано, не надіслано",
+    "Encrypted by a verified device": "Зашифровано перевіреним пристроєм",
+    "Encrypted by an unverified device": "Зашифровано неперевіреним пристроєм",
+    "Unencrypted message": "Незашифроване повідомлення",
+    "Please select the destination room for this message": "Будь ласка, виберіть кімнату, куди потрібно надіслати це повідомлення",
+    "Verified": "Перевірено",
+    "Unverified": "Неперевірено",
+    "device id: ": "id пристрою: ",
+    "Disinvite": "Скасувати запрошення",
+    "Kick": "Викинути",
+    "Disinvite this user?": "Скасувати запрошення для цього користувача?",
+    "Kick this user?": "Викинути цього користувача?",
+    "Failed to kick": "Не вдалося викинути",
+    "Unban": "Розблокувати",
+    "Unban this user?": "Розблокувати цього користувача?",
+    "Ban this user?": "Заблокувати цього користувача?",
+    "Failed to ban user": "Не вдалося заблокувати користувача",
+    "Demote yourself?": "Знизити свій рівень прав?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ви не зможете скасувати цю дію, оскільки ви знижуєте свій рівень прав. Якщо ви останній користувач з правами в цій кімнаті, ви не зможете отримати повноваження знову.",
+    "Demote": "Знизити рівень прав",
+    "Failed to mute user": "Не вдалося заглушити користувача",
+    "Failed to toggle moderator status": "Не вдалося перемкнути статус модератора",
+    "Failed to change power level": "Не вдалося змінити рівень повноважень"
 }

From a9e7ef17b3bb63e55ed81faa466e55a149f4c877 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 5 Nov 2018 11:25:42 +0100
Subject: [PATCH 174/218] Add visible guest warning to encourage login

If you happen to get logged out, it might not be very clear what has happened
visually. This adds a visible warning to the top of the home page to suggest
logging in.

Fixes vector-im/riot-web#7629.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
---
 res/css/structures/_HomePage.scss     | 13 ++++++++
 src/components/structures/HomePage.js | 44 +++++++++++++++++++++++++++
 src/i18n/strings/en_EN.json           |  2 ++
 src/i18n/strings/en_US.json           |  2 ++
 4 files changed, 61 insertions(+)

diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index cdac1bcc8a..dc3158b39d 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -33,3 +33,16 @@ limitations under the License.
 .mx_HomePage_body {
 //  margin-left: 63px;
 }
+
+.mx_HomePage_guest_warning {
+    display: flex;
+    background-color: $secondary-accent-color;
+    border: 1px solid $accent-color;
+    margin: 20px;
+    padding: 20px 40px;
+    border-radius: 5px;
+}
+
+.mx_HomePage_guest_warning img {
+    padding-right: 10px;
+}
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index 457796f5dc..6f6a3d5268 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -23,6 +23,8 @@ import request from 'browser-request';
 import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
 import sdk from '../../index';
+import { MatrixClient } from 'matrix-js-sdk';
+import dis from '../../dispatcher';
 
 class HomePage extends React.Component {
     static displayName = 'HomePage';
@@ -37,6 +39,10 @@ class HomePage extends React.Component {
         homePageUrl: PropTypes.string,
     };
 
+    static contextTypes = {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    };
+
     state = {
             iframeSrc: '',
             page: '',
@@ -86,10 +92,47 @@ class HomePage extends React.Component {
         this._unmounted = true;
     }
 
+    onLoginClick() {
+        dis.dispatch({ action: 'start_login' });
+    }
+
+    onRegisterClick() {
+        dis.dispatch({ action: 'start_registration' });
+    }
+
     render() {
+        let guestWarning = "";
+        if (this.context.matrixClient.isGuest()) {
+            guestWarning = (
+                <div className="mx_HomePage_guest_warning">
+                    <img src="img/warning.svg" width="24" height="23" />
+                    <div>
+                        <div>
+                            { _t("You are currently using Riot anonymously as a guest.") }
+                        </div>
+                        <div>
+                            { _t(
+                                'If you would like to create a Matrix account you can <a>register</a> now.',
+                                {},
+                                { 'a': (sub) => <a href="#" onClick={this.onRegisterClick}>{ sub }</a> },
+                            ) }
+                        </div>
+                        <div>
+                            { _t(
+                                'If you already have a Matrix account you can <a>log in</a> instead.',
+                                {},
+                                { 'a': (sub) => <a href="#" onClick={this.onLoginClick}>{ sub }</a> },
+                            ) }
+                        </div>
+                    </div>
+                </div>
+            );
+        }
+
         if (this.state.iframeSrc) {
             return (
                 <div className="mx_HomePage">
+                    { guestWarning }
                     <iframe src={ this.state.iframeSrc } />
                 </div>
             );
@@ -98,6 +141,7 @@ class HomePage extends React.Component {
             const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
             return (
                 <GeminiScrollbarWrapper autoshow={true} className="mx_HomePage">
+                    { guestWarning }
                     <div className="mx_HomePage_body" dangerouslySetInnerHTML={{ __html: this.state.page }}>
                     </div>
                 </GeminiScrollbarWrapper>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e0f4663532..f5f60edbe8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -922,7 +922,9 @@
     "Username available": "Username available",
     "To get started, please pick a username!": "To get started, please pick a username!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
+    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "You have successfully set a password!": "You have successfully set a password!",
     "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
     "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index d8733ab05a..ba37b5dc9c 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -644,7 +644,9 @@
     "Username not available": "Username not available",
     "Something went wrong!": "Something went wrong!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
+    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",

From 51a84c2f7865eced385a21b84a2a54f77340521a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 13 Nov 2018 18:49:23 +0000
Subject: [PATCH 175/218] Prepare changelog for v0.14.4

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 857a2d4bba..9a98991e38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.14.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.4) (2018-11-13)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.3...v0.14.4)
+
+ * Include change that was supposed to be included in orevious version
+
 Changes in [0.14.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.3) (2018-11-13)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.2...v0.14.3)

From 09006a842a4aaa53ef5d2c3f05b175b15252d0aa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 13 Nov 2018 18:49:24 +0000
Subject: [PATCH 176/218] v0.14.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9bab6dd9cb..0acbd5ab62 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 11126e9f7a2a7f6bdd2b848748bf8c06dbabcd23 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 14 Nov 2018 02:54:47 +0000
Subject: [PATCH 177/218] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ba23947fc2..242990264c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1293,5 +1293,12 @@
     "Please accept all of the policies": "請接受所有政策",
     "Please review and accept the policies of this homeserver:": "請審閱並接受此家伺服器的政策：",
     "Add some now": "現在就新增一些",
-    "Joining room...": "正在加入聊天室……"
+    "Joining room...": "正在加入聊天室……",
+    "Pin unread rooms to the top of the room list": "釘選未讀的聊天示到聊天室清單頂端",
+    "Pin rooms I'm mentioned in to the top of the room list": "釘選我被提及的聊天室到聊天室清單頂端",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "若您想要建立一個 Matrix 帳號，您現在可以<a>註冊</a>了。",
+    "You are currently using Riot anonymously as a guest.": "您目前是以訪客的身份匿名使用 Riot。",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "您是此社群的管理員。您將無法在沒有其他管理員的邀請下重新加入。",
+    "Open Devtools": "開啟開發者工具",
+    "Show developer tools": "顯示開發者工具"
 }

From fe27fae80f15a6b69fdbd650182756f06592d9e1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 14 Nov 2018 17:59:24 -0700
Subject: [PATCH 178/218] Add m.login.terms to the ILAG-compatible flows

Otherwise we get "Registration Required" instead of "Pick a username"

Part of https://github.com/vector-im/riot-web/issues/7700
---
 src/Registration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Registration.js b/src/Registration.js
index 070178fecb..f86c9cc618 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -45,7 +45,7 @@ export async function startAnyRegistrationFlow(options) {
     // caution though.
     const hasIlagFlow = flows.some((flow) => {
         return flow.stages.every((stage) => {
-            return ['m.login.dummy', 'm.login.recaptcha'].includes(stage);
+            return ['m.login.dummy', 'm.login.recaptcha', 'm.login.terms'].includes(stage);
         });
     });
 

From 2ffc024fabed87b3a8f8d7f85e9dac023905e7e6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 14 Nov 2018 18:26:08 -0700
Subject: [PATCH 179/218] Add a dedicated "Continue" button to the terms auth
 stage

The button itself is conditionally enabled because the ILAG dialog already has a continue button. It'd be confusing to users to have 2 continue buttons on the same dialog, so this commit adds the structure required to pass along clicks from the dialog's button down to the UI auth component.

The other place the continue button would appear is on the register page (not ILAG). The button's style is different here, however that will be improved in a later commit.

Part of https://github.com/vector-im/riot-web/issues/7700
---
 .../_InteractiveAuthEntryComponents.scss      |  4 +++
 src/components/structures/InteractiveAuth.js  | 12 +++++++
 src/components/views/dialogs/SetMxIdDialog.js |  5 +++
 .../login/InteractiveAuthEntryComponents.js   | 32 +++++++++++++++----
 src/i18n/strings/en_EN.json                   |  1 +
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/res/css/views/login/_InteractiveAuthEntryComponents.scss b/res/css/views/login/_InteractiveAuthEntryComponents.scss
index 183b5cd251..af240498b4 100644
--- a/res/css/views/login/_InteractiveAuthEntryComponents.scss
+++ b/res/css/views/login/_InteractiveAuthEntryComponents.scss
@@ -40,3 +40,7 @@ limitations under the License.
     background-color: $light-fg-color;
     cursor: default;
 }
+
+.mx_InteractiveAuthEntryComponents_termsPolicy {
+    display: block;
+}
\ No newline at end of file
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 8428e3c714..39e015f42e 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -68,6 +68,11 @@ export default React.createClass({
         // If true, poll to see if the auth flow has been completed
         // out-of-band
         poll: PropTypes.bool,
+
+        // If true, components will be told that the 'Continue' button
+        // is managed by some other party and should not be managed by
+        // the component itself.
+        continueIsManaged: PropTypes.bool,
     },
 
     getInitialState: function() {
@@ -128,6 +133,12 @@ export default React.createClass({
         }
     },
 
+    tryContinue: function() {
+        if (this.refs.stageComponent && this.refs.stageComponent.tryContinue) {
+            this.refs.stageComponent.tryContinue();
+        }
+    },
+
     _authStateUpdated: function(stageType, stageState) {
         const oldStage = this.state.authStage;
         this.setState({
@@ -192,6 +203,7 @@ export default React.createClass({
                 fail={this._onAuthStageFailed}
                 setEmailSid={this._setEmailSid}
                 makeRegistrationUrl={this.props.makeRegistrationUrl}
+                hideContinue={this.props.continueIsManaged}
             />
         );
     },
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index c6427001ad..fb892c4a0a 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -101,6 +101,9 @@ export default React.createClass({
     },
 
     onSubmit: function(ev) {
+        if (this.refs.uiAuth) {
+            this.refs.uiAuth.tryContinue();
+        }
         this.setState({
             doingUIAuth: true,
         });
@@ -217,6 +220,8 @@ export default React.createClass({
                 onAuthFinished={this._onUIAuthFinished}
                 inputs={{}}
                 poll={true}
+                ref="uiAuth"
+                continueIsManaged={true}
             />;
         }
         const inputClasses = classnames({
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index 481cdc60b2..dce718d3bc 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -222,6 +222,7 @@ export const TermsAuthEntry = React.createClass({
         stageParams: PropTypes.object.isRequired,
         errorText: PropTypes.string,
         busy: PropTypes.bool,
+        hideContinue: PropTypes.bool,
     },
 
     componentWillMount: function() {
@@ -275,19 +276,30 @@ export const TermsAuthEntry = React.createClass({
         });
     },
 
-    _trySubmit: function(policyId) {
+    tryContinue: function() {
+        this._trySubmit();
+    },
+
+    _togglePolicy: function(policyId) {
         const newToggles = {};
-        let allChecked = true;
         for (const policy of this.state.policies) {
             let checked = this.state.toggledPolicies[policy.id];
             if (policy.id === policyId) checked = !checked;
 
             newToggles[policy.id] = checked;
+        }
+        this.setState({"toggledPolicies": newToggles});
+    },
+
+    _trySubmit: function() {
+        let allChecked = true;
+        for (const policy of this.state.policies) {
+            let checked = this.state.toggledPolicies[policy.id];
             allChecked = allChecked && checked;
         }
 
-        this.setState({"toggledPolicies": newToggles});
         if (allChecked) this.props.submitAuthDict({type: TermsAuthEntry.LOGIN_TYPE});
+        else this.setState({errorText: _t("Please review and accept all of the homeserver's policies")});
     },
 
     render: function() {
@@ -303,27 +315,33 @@ export const TermsAuthEntry = React.createClass({
             allChecked = allChecked && checked;
 
             checkboxes.push(
-                <label key={"policy_checkbox_" + policy.id}>
-                    <input type="checkbox" onClick={() => this._trySubmit(policy.id)} checked={checked} />
+                <label key={"policy_checkbox_" + policy.id} className="mx_InteractiveAuthEntryComponents_termsPolicy">
+                    <input type="checkbox" onClick={() => this._togglePolicy(policy.id)} checked={checked} />
                     <a href={policy.url} target="_blank" rel="noopener">{ policy.name }</a>
                 </label>,
             );
         }
 
         let errorSection;
-        if (this.props.errorText) {
+        if (this.props.errorText || this.state.errorText) {
             errorSection = (
                 <div className="error" role="alert">
-                    { this.props.errorText }
+                    { this.props.errorText || this.state.errorText }
                 </div>
             );
         }
 
+        let submitButton;
+        if (!this.props.hideContinue) {
+            submitButton = <button className="mx_textButton" onClick={this._trySubmit}>{_t("Continue")}</button>;
+        }
+
         return (
             <div>
                 <p>{_t("Please review and accept the policies of this homeserver:")}</p>
                 { checkboxes }
                 { errorSection }
+                { submitButton }
             </div>
         );
     },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 572cc0d2b3..3618f661c3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -646,6 +646,7 @@
     "Dismiss": "Dismiss",
     "To continue, please enter your password.": "To continue, please enter your password.",
     "Password:": "Password:",
+    "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",
     "Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:",
     "An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s",
     "Please check your email to continue registration.": "Please check your email to continue registration.",

From c8b38606cc7f0f89186d36c3d33dc8ef603ca048 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 14 Nov 2018 18:40:00 -0700
Subject: [PATCH 180/218] Fix terms auth continue button CSS

---
 res/css/views/login/_InteractiveAuthEntryComponents.scss    | 6 ++++--
 .../views/login/InteractiveAuthEntryComponents.js           | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/res/css/views/login/_InteractiveAuthEntryComponents.scss b/res/css/views/login/_InteractiveAuthEntryComponents.scss
index af240498b4..11f55e69f8 100644
--- a/res/css/views/login/_InteractiveAuthEntryComponents.scss
+++ b/res/css/views/login/_InteractiveAuthEntryComponents.scss
@@ -30,13 +30,15 @@ limitations under the License.
     border: 1px solid $accent-color;
 }
 
-.mx_InteractiveAuthEntryComponents_msisdnSubmit {
+.mx_InteractiveAuthEntryComponents_msisdnSubmit,
+.mx_InteractiveAuthEntryComponents_termsSubmit {
     margin-top: 4px;
     margin-bottom: 5px;
 }
 
 // XXX: This should be a common button class
-.mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled {
+.mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled,
+.mx_InteractiveAuthEntryComponents_termsSubmit:disabled {
     background-color: $light-fg-color;
     cursor: default;
 }
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index dce718d3bc..26b93c9fbe 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -333,7 +333,9 @@ export const TermsAuthEntry = React.createClass({
 
         let submitButton;
         if (!this.props.hideContinue) {
-            submitButton = <button className="mx_textButton" onClick={this._trySubmit}>{_t("Continue")}</button>;
+            // XXX: button classes
+            submitButton = <button className="mx_InteractiveAuthEntryComponents_termsSubmit mx_UserSettings_button"
+                                   onClick={this._trySubmit}>{_t("Continue")}</button>;
         }
 
         return (

From 5dd155779f104113e24942b1dfeebc4fa92872c7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Nov 2018 12:01:00 +0000
Subject: [PATCH 181/218] released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c2eb284a13..9a76821d91 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "0.13.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 4e740eb13681b189664f74f4561ec535ad5361fa Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Thu, 15 Nov 2018 12:01:39 +0000
Subject: [PATCH 182/218] Translated using Weblate (Albanian)

Currently translated at 56.0% (715 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
---
 src/i18n/strings/sq.json | 524 +++++++++++++++++++++++++++++++++++----
 1 file changed, 474 insertions(+), 50 deletions(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 72097f8ab1..12a30ef657 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1,45 +1,45 @@
 {
-    "This email address is already in use": "Kjo adresë e-mail-i tashmë është në përdorim",
-    "This phone number is already in use": "Ky numër telefoni tashmë është në përdorim",
+    "This email address is already in use": "Kjo adresë email është tashmë në përdorim",
+    "This phone number is already in use": "Ky numër telefoni është tashmë në përdorim",
     "Failed to verify email address: make sure you clicked the link in the email": "Vërtetimi i adresës e-mail i pasukseshëm: Sigurohu që ke klikuar lidhjen në e-mail",
-    "The platform you're on": "Platforma që jë duke përdorur",
+    "The platform you're on": "Platforma ku gjendeni",
     "The version of Riot.im": "Versioni i Riot.im-it",
     "Whether or not you're logged in (we don't record your user name)": "A je i lajmëruar apo jo (ne nuk do të inçizojmë emrin përdorues tëndë)",
-    "Your language of choice": "Gjuha jote e zgjedhur",
-    "Which officially provided instance you are using, if any": "Cilën instancë zyrtarisht të ofruar je duke përdorur, në rast që je",
+    "Your language of choice": "Gjuha juaj e zgjedhur",
+    "Which officially provided instance you are using, if any": "Cilën instancë të furnizuar zyrtarish po përdorni, në pastë",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "A je duke e përdorur mënyrën e tekstit të pasuruar të redaktionuesit të tekstit të pasuruar apo jo",
-    "Your homeserver's URL": "URL-ja e server-it shtëpiak tëndë",
-    "Your identity server's URL": "URL-ja e server-it identiteti tëndë",
+    "Your homeserver's URL": "URL e Shërbyesit tuaj Home",
+    "Your identity server's URL": "URL e shërbyesit tuaj të identiteteve",
     "Analytics": "Analiza",
     "The information being sent to us to help make Riot.im better includes:": "Informacionet që dërgohen për t'i ndihmuar Riot.im-it të përmirësohet përmbajnë:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kur kjo faqe pëmban informacione që mund të të identifikojnë, sikur një dhomë, përdorues apo identifikatues grupi, këto të dhëna do të mënjanohen para se t‘i dërgohën një server-it.",
-    "Call Failed": "Thirrja nuk mundej të realizohet",
+    "Call Failed": "Thirrja Dështoi",
     "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Pajisje të panjohura ndodhen në këtë dhomë: nësë vazhdon pa i vërtetuar, është e mundshme që dikush të jua përgjon thirrjen.",
     "Review Devices": "Rishiko pajisjet",
-    "Call Anyway": "Thirr prapëseprapë",
-    "Answer Anyway": "Prano prapëseprapë",
-    "Call": "Thirr",
-    "Answer": "Prano",
+    "Call Anyway": "Thirre Sido Qoftë",
+    "Answer Anyway": "Përgjigju Sido Qoftë",
+    "Call": "Thirrje",
+    "Answer": "Përgjigje",
     "Call Timeout": "Skadim kohe thirrjeje",
-    "The remote side failed to pick up": "Ana e kundërt nuk arriti të pranojë",
+    "The remote side failed to pick up": "Ana e largët dështoi të përgjigjet",
     "Unable to capture screen": "Ekrani nuk mundi të inçizohej",
     "Existing Call": "Thirrje aktuale",
-    "You are already in a call.": "Tashmë je në thirrje.",
+    "You are already in a call.": "Jeni tashmë në një thirrje.",
     "VoIP is unsupported": "VoIP nuk mbulohet",
     "You cannot place VoIP calls in this browser.": "Thirrjet me VoIP nuk mbulohen nga ky kërkues uebi.",
-    "You cannot place a call with yourself.": "Nuk mund të realizosh thirrje me vetveten.",
+    "You cannot place a call with yourself.": "S’mund të bëni thirrje me vetveten.",
     "Conference calls are not supported in this client": "Thirrjet konference nuk mbulohen nga ky klienti",
     "Conference calls are not supported in encrypted rooms": "Thirrjet konference nuk mbulohen në dhoma të shifruara",
-    "Warning!": "Paralajmërim!",
+    "Warning!": "Sinjalizim!",
     "Conference calling is in development and may not be reliable.": "Thirrja konference ende është në zhvillim dhe mund të jetë e paqëndrueshme.",
     "Failed to set up conference call": "Thirrja konference nuk mundi të realizohej",
     "Conference call failed.": "Thirrja konference dështoi.",
-    "The file '%(fileName)s' failed to upload": "Fajli '%(fileName)s' nuk mundi të mbartet",
+    "The file '%(fileName)s' failed to upload": "Dështoi ngarkimi i kartelës '%(fileName)s'",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Fajli '%(fileName)s' tejkalon kufirin madhësie për mbartje e këtij server-i shtëpiak",
-    "Upload Failed": "Mbartja dështoi",
+    "Upload Failed": "Ngarkimi Dështoi",
     "Failure to create room": "Dhoma nuk mundi të krijohet",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server-i është i padisponueshëm, i ngarkuar tej mase, apo ka një gabim.",
-    "Send anyway": "Dërgo prapëseprapë",
+    "Send anyway": "Dërgoje sido qoftë",
     "Send": "Dërgoje",
     "Sun": "Die",
     "Mon": "Hën",
@@ -51,15 +51,15 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
-    "Who would you like to add to this community?": "Kë kishe dashur të shtosh në këtë komunitet?",
+    "Who would you like to add to this community?": "Kë do të donit të shtonit te kjo bashkësi?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Paralajmërim: se cili që e shton në një komunitet do t‘i doket se cilit që e di identifikatuesin e komunitetit",
-    "Invite new community members": "Fto anëtar të ri komuniteti",
-    "Name or matrix ID": "Emri apo identifikatuesi matrix-i",
+    "Invite new community members": "Ftoni anëtarë të rinj bashkësie",
+    "Name or matrix ID": "Emër ose ID matrix-i",
     "Invite to Community": "Fto në komunitet",
     "Which rooms would you like to add to this community?": "Cilët dhoma kishe dashur t‘i shtosh në këtë komunitet?",
     "Show these rooms to non-members on the community page and room list?": "A t‘i duken dhomat joanëtarëvë ne faqën komuniteti si dhe listën dhome?",
-    "Add rooms to the community": "Shto dhoma komunitetit",
-    "Add to community": "Shto në komunitet",
+    "Add rooms to the community": "Shtoni dhoma te bashkësia",
+    "Add to community": "Shtoje te kjo bashkësi",
     "Jan": "Jan",
     "Feb": "Shk",
     "Mar": "Mar",
@@ -77,42 +77,42 @@
     "Failed to invite users to community": "Përdoruesit nuk mundën të ftohën",
     "Failed to invite users to %(groupId)s": "Nuk mundën të ftohën përdoruesit në %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Nuk mundën të shtohen dhomat vijuese në %(groupId)s:",
-    "Unnamed Room": "Dhomë paemër",
+    "Unnamed Room": "Dhomë e Paemërtuar",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot nuk ka lejim të të dergojë lajmërime - të lutem kontrollo rregullimet e kërkuesit ueb tëndë",
     "Riot was not given permission to send notifications - please try again": "Riot-it nuk i është dhënë leje të dërgojë lajmërime - të lutëm përpjeku serish",
     "Unable to enable Notifications": "Lajmërimet nuk mundën të lëshohen",
-    "This email address was not found": "Kjo adresë e-mail-i nuk është gjetur",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Adresa e-mail-i yt nuk duket së është lidhur më një indentifikatues matrix në këtë server shtëpiak.",
-    "Default": "Standardi",
-    "Restricted": "Kufizuar",
+    "This email address was not found": "Kjo adresë email s’u gjet",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Adresa juaj email s’duket të jetë e përshoqëruar me një ID Matrix në këtë shërbyes Home.",
+    "Default": "Parazgjedhje",
+    "Restricted": "E kufizuar",
     "Moderator": "Moderator",
-    "Admin": "Administrator",
-    "Start a chat": "Fillo bisedë",
-    "Who would you like to communicate with?": "Me kë kishe dashur të bisedosh?",
-    "Email, name or matrix ID": "E-mail-i, emri apo identifikatuesi matrix",
-    "Start Chat": "Fillo bisedë",
-    "Invite new room members": "Fto anëtar dhome të rinjë",
-    "Who would you like to add to this room?": "Kë kishe dashur të shtosh në këtë dhomë?",
-    "Send Invites": "Dërgo ftesa",
+    "Admin": "Përgjegjës",
+    "Start a chat": "Nisni një fjalosje",
+    "Who would you like to communicate with?": "Me kë do të donit të komunikonit?",
+    "Email, name or matrix ID": "Email, emër ose ID matrix",
+    "Start Chat": "Filloni Fjalosje",
+    "Invite new room members": "Ftoni anëtarë të rinj dhome",
+    "Who would you like to add to this room?": "Kë do të donit të shtonit te kjo dhomë?",
+    "Send Invites": "Dërgoni Ftesa",
     "Failed to invite user": "Përdoruesi nuk mundi të ftohej",
     "Operation failed": "Veprimi dështoi",
     "Failed to invite": "Nuk mundi të ftohet",
     "Failed to invite the following users to the %(roomName)s room:": "Përdoruesit vijuesë nuk mundën të ftohen në dhomën %(roomName)s:",
-    "You need to be logged in.": "Duhesh të jesh i lajmëruar.",
-    "You need to be able to invite users to do that.": "Duhesh të kesh aftësinë të ftosh përdorues për të bërë këtë.",
+    "You need to be logged in.": "Lypset të jeni i futur në llogarinë tuaj.",
+    "You need to be able to invite users to do that.": "Që ta bëni këtë, lypset të jeni në gjendje të ftoni përdorues.",
     "Unable to create widget.": "Widget-i nuk mundi të krijohet.",
     "Failed to send request.": "Lutja nuk mundi të dërgohej.",
-    "This room is not recognised.": "Kjo dhomë nuk është e njohur.",
+    "This room is not recognised.": "Kjo dhomë s’është e pranuar.",
     "Power level must be positive integer.": "Niveli fuqie duhet të jetë numër i plotë pozitiv.",
-    "You are not in this room.": "Ti nuk je në këtë dhomë.",
-    "You do not have permission to do that in this room.": "Nuk ke leje të bësh këtë në këtë dhomë.",
-    "Room %(roomId)s not visible": "Dhoma %(roomId)s e padukshme",
-    "Usage": "Përdorimi",
+    "You are not in this room.": "S’gjendeni në këtë dhomë.",
+    "You do not have permission to do that in this room.": "S’keni leje për ta bërë këtë në këtë dhomë.",
+    "Room %(roomId)s not visible": "Dhoma %(roomId)s s’është e dukshme",
+    "Usage": "Përdorim",
     "/ddg is not a command": "/ddg s'është komandë",
     "To use it, just wait for autocomplete results to load and tab through them.": "Për të përdorur, thjesht prit derisa të mbushën rezultatat vetëplotësuese dhe pastaj shfletoji.",
-    "Unrecognised room alias:": "Emri i dhomës të panjohur:",
-    "Ignored user": "Përdoruesë të shpërfillur",
-    "You are now ignoring %(userId)s": "Tash %(userId)s shpërfillet prej teje",
+    "Unrecognised room alias:": "Alias dhome jo i pranuar:",
+    "Ignored user": "Përdorues i shpërfillur",
+    "You are now ignoring %(userId)s": "Tani po e shpërfillni %(userId)s",
     "Unignored user": "Përdorues jo më i shpërfillur",
     "Fetching third party location failed": "Dështoi prurja e vendndodhjes së palës së tretë",
     "A new version of Riot is available.": "Ka gati një version të ri Riot-it.",
@@ -269,7 +269,7 @@
     "Enable audible notifications in web client": "Aktivizoni njoftime audio te klienti web",
     "Register": "Regjistrohuni",
     "Off": "Off",
-    "Edit": "Përpunoni",
+    "Edit": "Përpuno",
     "Riot does not know how to join a room on this network": "Riot-i nuk di si të hyjë në një dhomë në këtë rrjet",
     "Mentions only": "Vetëm @përmendje",
     "remove %(name)s from the directory.": "hiqe %(name)s prej drejtorie.",
@@ -287,7 +287,7 @@
     "%(count)s Members|one": "%(count)s Anëtar",
     "Developer Tools": "Mjete Zhvilluesi",
     "View Source": "Shihini Burimin",
-    "Custom Server Options": "Mundësi Vetjake Shërbyesi",
+    "Custom Server Options": "Mundësi Shërbyesi Vetjak",
     "Event Content": "Lëndë Akti",
     "Rooms": "Dhoma",
     "#example": "#shembull",
@@ -295,5 +295,429 @@
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Me shfletuesin tuaj të tanishëm, pamja dhe ndjesitë nga aplikacioni mund të jenë plotësisht të pasakta, dhe disa nga ose krejt veçoritë të mos funksionojnë. Nëse doni ta provoni sido qoftë, mund të vazhdoni, por mos u ankoni për çfarëdo problemesh që mund të hasni!",
     "Checking for an update...": "Po kontrollohet për një përditësim…",
     "There are advanced notifications which are not shown here": "Ka njoftime të thelluara që nuk shfaqen këtu",
-    "Show empty room list headings": "Shfaqi emrat e listave të zbrazëta dhomash"
+    "Show empty room list headings": "Shfaqi emrat e listave të zbrazëta dhomash",
+    "PM": "PM",
+    "AM": "AM",
+    "Room name or alias": "Emër dhome ose alias",
+    "Unknown (user, device) pair:": "Çift (përdorues, pajisje) i panjohur:",
+    "Device already verified!": "Pajisjeje tashmë e verifikuar!",
+    "Verified key": "Kyç i verifikuar",
+    "Unrecognised command:": "Urdhër jo i pranuar: ",
+    "Reason": "Arsye",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s kërkoi një konferencë VoIP.",
+    "VoIP conference started.": "Konferenca VoIP filloi.",
+    "VoIP conference finished.": "Konferenca VoIP përfundoi.",
+    "Someone": "Dikush",
+    "(no answer)": "(s’ka përgjigje)",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, prej çastit kur janë ftuar.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, prej çastit kur morën pjesë.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për këdo.",
+    "%(displayName)s is typing": "%(displayName)s po shtyp",
+    "Use compact timeline layout": "Përdorni skemë grafike kompakte për rrjedhën kohore",
+    "Always show message timestamps": "Shfaq përherë vula kohore për mesazhet",
+    "Room Colour": "Ngjyrë Dhome",
+    "unknown caller": "thirrës i panjohur",
+    "Decline": "Hidhe poshtë",
+    "Accept": "Pranoje",
+    "Incorrect verification code": "Kod verifikimi i pasaktë",
+    "Enter Code": "Jepni Kod",
+    "Submit": "Parashtroje",
+    "Phone": "Telefon",
+    "Add phone number": "Shtoni numër telefoni",
+    "Add": "Shtojeni",
+    "Upload new:": "Ngarko të re:",
+    "No display name": "S’ka emër shfaqjeje",
+    "New passwords don't match": "Fjalëkalimet e reja s’përputhen",
+    "Passwords can't be empty": "Fjalëkalimet s’mund të jenë të zbrazët",
+    "Export E2E room keys": "Eksporto kyçe dhome E2E",
+    "Do you want to set an email address?": "Doni të caktoni një adresë email?",
+    "Current password": "Fjalëkalimi i tanishëm",
+    "Password": "Fjalëkalim",
+    "New Password": "Fjalëkalim i Ri",
+    "Confirm password": "Ripohoni frazëkalimin",
+    "Change Password": "Ndryshoni Fjalëkalimin",
+    "Authentication": "Mirëfilltësim",
+    "Delete %(count)s devices|one": "Fshije pajisjen",
+    "Device ID": "ID Pajisjeje",
+    "Device Name": "Emër Pajisjeje",
+    "Last seen": "Parë së fundi më",
+    "Select devices": "Përzgjidhni pajisje",
+    "Disable Notifications": "Çaktivizo Njoftimet",
+    "Enable Notifications": "Aktivizo Njoftimet",
+    "Invalid alias format": "Format i pavlefshëm aliasesh",
+    "Invalid address format": "Format i pavlefshëm adresash",
+    "not specified": "e papërcaktuar",
+    "not set": "s’është caktuar",
+    "Remote addresses for this room:": "Adresa të largëta për këtë dhomë:",
+    "Addresses": "Adresa",
+    "The main address for this room is": "Adresa kryesore për këtë dhomë është",
+    "Local addresses for this room:": "Adresa vendore për këtë dhomë:",
+    "This room has no local addresses": "Kjo dhomë s’ka adresë vendore",
+    "Invalid community ID": "ID bashkësie e pavlefshme",
+    "URL Previews": "Paraparje URL-sh",
+    "Add a widget": "Shtoni një widget",
+    "Drop File Here": "Hidheni Kartelën Këtu",
+    "Drop file here to upload": "Hidheni kartelën këtu që të ngarkohet",
+    " (unsupported)": " (e pambuluar)",
+    "%(senderName)s sent an image": "%(senderName)s dërgoi një figurë",
+    "%(senderName)s sent a video": "%(senderName)s dërgoi një video",
+    "Options": "Mundësi",
+    "Key request sent.": "Kërkesa për kyç u dërgua.",
+    "Encrypted by a verified device": "Fshehtëzuar nga një pajisje e verifikuar",
+    "Encrypted by an unverified device": "Fshehtëzuar nga një pajisje e paverifikuar",
+    "Unencrypted message": "Mesazh i pafshehtëzuar",
+    "Please select the destination room for this message": "Ju lutemi, përzgjidhni dhomën vendmbërritje për këtë mesazh",
+    "Blacklisted": "Në Listë të Zezë",
+    "Verified": "E verifikuar",
+    "Unverified": "I paverifikuar",
+    "device id: ": "ID pajisjeje: ",
+    "Kick": "Përzëre",
+    "Kick this user?": "Të përzihet ky përdorues?",
+    "Unban": "Hiqja dëbimin",
+    "Ban": "Dëboje",
+    "Ban this user?": "Të dëbohet ky përdorues?",
+    "Are you sure?": "Jeni i sigurt?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "S’do të jeni në gjendje ta zhbëni këtë ndryshim, ngaqë po e promovoni përdoruesin të ketë të njëjtën shkallë pushteti si ju vetë.",
+    "No devices with registered encryption keys": "S’ka pajisje me kyçe fshehtëzimi të regjistruar",
+    "Devices": "Pajisje",
+    "Unignore": "Shpërfille",
+    "Ignore": "Shpërfille",
+    "Mention": "Përmendje",
+    "Invite": "Ftoje",
+    "User Options": "Mundësi Përdoruesi",
+    "Direct chats": "Fjalosje të drejtpërdrejta",
+    "Make Moderator": "Kaloje Moderator",
+    "Admin Tools": "Mjete Përgjegjësi",
+    "Level:": "Nivel:",
+    "and %(count)s others...|other": "dhe %{count} të tjerë…",
+    "and %(count)s others...|one": "dhe një tjetër…",
+    "Filter room members": "Filtroni anëtarë dhome",
+    "Attachment": "Bashkëngjitje",
+    "Upload Files": "Ngarkoni Kartela",
+    "Are you sure you want to upload the following files?": "Jeni i sigurt se doni të ngarkohen kartelat vijuese?",
+    "Encrypted room": "Dhomë e fshehtëzuar",
+    "Unencrypted room": "Dhomë e pafshehtëzuar",
+    "Voice call": "Thirrje audio",
+    "Video call": "Thirrje video",
+    "Upload file": "Ngarkoni kartelë",
+    "Show Text Formatting Toolbar": "Shfaq Panel Formatimi Tekstesh",
+    "Send an encrypted reply…": "Dërgoni një përgjigje të fshehtëzuar…",
+    "Send a reply (unencrypted)…": "Dërgoni një përgjigje (të pafshehtëzuar)…",
+    "Send an encrypted message…": "Dërgoni një mesazh të fshehtëzuar…",
+    "Send a message (unencrypted)…": "Dërgoni një mesazh (të pafshehtëzuar)…",
+    "You do not have permission to post to this room": "S’keni leje të postoni në këtë dhomë",
+    "Server error": "Gabim shërbyesi",
+    "Command error": "Gabim urdhri",
+    "bold": "të trasha",
+    "italic": "të pjerrta",
+    "Markdown is disabled": "Markdown është i çaktivizuar",
+    "Markdown is enabled": "Markdown është i aktivizuar",
+    "Loading...": "Po ngarkohet…",
+    "Pinned Messages": "Mesazhe të Fiksuar",
+    "Jump to message": "Kalo te mesazhi",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "Në linjë për %(duration)s",
+    "Idle for %(duration)s": "I plogësht për %(duration)s",
+    "Offline for %(duration)s": "Jo në linjë për %(duration)s",
+    "Idle": "I plogësht",
+    "Offline": "Jo në linjë",
+    "Unknown": "I panjohur",
+    "Seen by %(userName)s at %(dateTime)s": "Parë nga %(userName)s më %(dateTime)s",
+    "Save": "Ruaje",
+    "Join Room": "Hyni në dhomë",
+    "Upload avatar": "Ngarkoni avatar",
+    "Remove avatar": "Hiqe avatarin",
+    "Settings": "Rregullime",
+    "Forget room": "Harroje dhomën",
+    "Show panel": "Shfaq panel",
+    "Community Invites": "Ftesa Bashkësie",
+    "Invites": "Ftesa",
+    "Favourites": "Të parapëlqyer",
+    "People": "Persona",
+    "Low priority": "Me përparësi të ulët",
+    "You may wish to login with a different account, or add this email to this account.": "Mund të doni të hyni me një llogari tjetër, ose ta shtoni këtë email te kjo llogari.",
+    "You have been invited to join this room by %(inviterName)s": "Jeni ftuar të merrni pjesë në këtë dhomë nga %(inviterName)s",
+    "Reason: %(reasonText)s": "Arsye: %(reasonText)s",
+    "Rejoin": "Rifutuni",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Jeni përzënë prej %(roomName)s nga %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Jeni përzënë nga kjo dhomë prej %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Jeni dëbuar prej %(roomName)s ngas %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Jeni dëbuar prej kësaj dhome nga %(userName)s.",
+    "This room": "Këtë dhomë",
+    "%(roomName)s does not exist.": "%(roomName)s s’ekziston.",
+    "You are trying to access a room.": "Po provoni të hyni në një dhomë.",
+    "This is a preview of this room. Room interactions have been disabled": "Kjo është një paraparje e kësaj dhome. Ndërveprimet në dhomë janë çaktivizuar",
+    "Banned by %(displayName)s": "Dëbuar nga %(displayName)s",
+    "Privacy warning": "Sinjalizim privatësie",
+    "The visibility of existing history will be unchanged": "Dukshmëria e historikut ekzistues nuk do të ndryshohet.",
+    "You should not yet trust it to secure data": "S’duhet t’i zini ende besë për sigurim të dhënash.",
+    "Enable encryption": "Aktivizoni fshehtëzim",
+    "Encryption is enabled in this room": "Në këtë dhomë është i aktivizuar fshehtëzimi",
+    "Encryption is not enabled in this room": "Në këtë dhomë s’është i aktivizuar fshehtëzimi",
+    "The default role for new room members is": "Roli parazgjedhje për përdorues të ri në dhomë është",
+    "Privileged Users": "Përdorues të Privilegjuar",
+    "Banned users": "Përdorues të dëbuar",
+    "Leave room": "Dilni nga dhomë",
+    "Tagged as: ": "Etiketuar me:",
+    "Click here to fix": "Klikoni këtu për ta ndrequr",
+    "Who can access this room?": "Kush mund të hyjë në këtë dhomë?",
+    "Only people who have been invited": "Vetëm persona që janë ftuar",
+    "Anyone who knows the room's link, apart from guests": "Cilido që di lidhjen e dhomës, hiq vizitorët",
+    "Anyone who knows the room's link, including guests": "Cilido që di lidhjen e dhomës, përfshi vizitorë",
+    "Who can read history?": "Kush mund të lexojë historikun?",
+    "Anyone": "Cilido",
+    "Permissions": "Leje",
+    "Advanced": "Të mëtejshme",
+    "Add a topic": "Shtoni një temë",
+    "Decrypt %(text)s": "Shfshehtëzoje %(text)s",
+    "Copied!": "U kopjua!",
+    "Add an Integration": "Shtoni një Integrim",
+    "This Home Server would like to make sure you are not a robot": "Ky Shërbyes Home do të donte të sigurohej se s’jeni robot",
+    "Sign in with CAS": "Hyni me CAS",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Mund t’i përdorni mundësitë e shërbyesit vetjak për të hyrë në shërbyes të tjerë Matrix, duke dhënë URL-në e një tjetër shërbyesi Home.",
+    "Password:": "Fjalëkalim:",
+    "Please check your email to continue registration.": "Ju lutemi, që të vazhdojë regjistrimi, kontrolloni email-in tuaj.",
+    "Please enter the code it contains:": "Ju lutemi, jepni kodin që përmbahet:",
+    "Code": "Kod",
+    "Start authentication": "Fillo mirëfilltësim",
+    "Username on %(hs)s": "Emër përdoruesi në %(hs)s",
+    "User name": "Emër përdoruesi",
+    "Mobile phone number": "Numër telefoni celular",
+    "Forgot your password?": "Harruat fjalëkalimin tuaj?",
+    "Sign in with": "Hyni me",
+    "Email address": "Adresë email",
+    "Sign in": "Hyni",
+    "Email address (optional)": "Adresë email (opsionale)",
+    "You are registering with %(SelectedTeamName)s": "Po regjistroheni te %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Numër telefoni celular (opsionale)",
+    "Default server": "Shërbyes parazgjedhje",
+    "Custom server": "Shërbyes vetjak",
+    "Home server URL": "URL shërbyesi Home",
+    "Identity server URL": "URL shërbyesi identitetesh",
+    "What does this mean?": "Ç’do të thotë kjo?",
+    "Filter community members": "Filtroni anëtarë bashkësie",
+    "Something went wrong!": "Diçka shkoi ters!",
+    "Visibility in Room List": "Dukshmëri në Listë Dhomash",
+    "Visible to everyone": "I dukshëm për këdo",
+    "Only visible to community members": "E dukshme vetëm për anëtarë të bashkësisë",
+    "Filter community rooms": "Filtroni dhoma bashkësie",
+    "You're not currently a member of any communities.": "Hëpërhë, s’jeni anëtar i ndonjë bashkësie.",
+    "Unknown Address": "Adresë e Panjohur",
+    "Allow": "Lejoje",
+    "Revoke widget access": "Shfuqizo hyrje widget",
+    "Create new room": "Krijoni dhomë të re",
+    "Unblacklist": "Hiqe nga listë e zezë",
+    "Blacklist": "Listë e zezë",
+    "Unverify": "Hiqi verifikimin",
+    "Verify...": "Verifikoni…",
+    "No results": "S’ka përfundime",
+    "Delete": "Fshije",
+    "Communities": "Bashkësi",
+    "Home": "Kreu",
+    "Integrations Error": "Gabim Integrimesh",
+    "Could not connect to the integration server": "S’u lidh dot te shërbyesi i integrimt",
+    "Manage Integrations": "Administroni Integrime",
+    "were invited %(count)s times|one": "janë ftuar",
+    "was invited %(count)s times|other": "është ftuar %(count)s herë",
+    "was invited %(count)s times|one": "është ftuar",
+    "were banned %(count)s times|one": "janë dëbuar",
+    "was banned %(count)s times|other": "është dëbuar %(count)s herë",
+    "was banned %(count)s times|one": "është dëbuar",
+    "were unbanned %(count)s times|one": "u është hequr dëbimi",
+    "was unbanned %(count)s times|other": "i është hequr dëbimi %(count)s herë",
+    "was unbanned %(count)s times|one": "i është hequr dëbimi",
+    "were kicked %(count)s times|one": "janë përzënë",
+    "was kicked %(count)s times|other": "është përzënë %(count)s herë",
+    "was kicked %(count)s times|one": "është përzënë",
+    "%(items)s and %(count)s others|other": "%(items)s dhe %(count)s të tjerë",
+    "%(items)s and %(count)s others|one": "%(items)s dhe një tjetër",
+    "%(items)s and %(lastItem)s": "%(items)s dhe %(lastItem)s",
+    "collapse": "tkurre",
+    "expand": "zgjeroje",
+    "Custom level": "Nivel vetjak",
+    "<a>In reply to</a> <pill>": "<a>Në Përgjigje të</a> <pill>",
+    "Room directory": "Drejtori Dhome",
+    "Start chat": "Filloni fjalosje",
+    "Add User": "Shtoni Përdorues",
+    "Matrix ID": "ID Matrix",
+    "Matrix Room ID": "ID Matrix dhome",
+    "email address": "adresë email",
+    "You have entered an invalid address.": "Keni dhënë adresë email të pavlefshme.",
+    "Start new chat": "Filloni fjalosje të re",
+    "Confirm Removal": "Ripohoni Heqjen",
+    "Create Community": "Krijoje Bashkësinë",
+    "Community Name": "Emër Bashkësie",
+    "Example": "Shembull",
+    "Community ID": "ID Bashkësie",
+    "example": "shembull",
+    "Create": "Krijoje",
+    "Create Room": "Krijoje Dhomën",
+    "Room name (optional)": "Emër dhome (në daçi)",
+    "Advanced options": "Mundësi të mëtejshme",
+    "Unknown error": "Gabim i panjohur",
+    "Incorrect password": "Fjalëkalim i pasaktë",
+    "Deactivate Account": "Çaktivizoje Llogarinë",
+    "Device name": "Emër pajisjeje",
+    "Device key": "Kyç pajisjeje",
+    "Verify device": "Verifiko pajisjen",
+    "An error has occurred.": "Ndodhi një gabim.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Shtuat një pajisje të re '%(displayName)s', e cila po kërkon kyçe fshehtëzimi.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Pajisja juaj e paverifikuar '%(displayName)s' po kërkon kyçe fshehtëzimi.",
+    "Start verification": "Fillo verifikimin",
+    "Share without verifying": "Ndajeni me të tjerë pa e verifikuar",
+    "Ignore request": "Shpërfille kërkesën",
+    "Loading device info...": "Po ngarkohen të dhëna pajisjeje…",
+    "Encryption key request": "Kërkesë kyçi fshehtëzimesh",
+    "Invalid Email Address": "Adresë Email e Pavlefshme",
+    "This doesn't appear to be a valid email address": "Kjo s’duket se është adresë email e vlefshme",
+    "Verification Pending": "Verifikim Në Pritje të Miratimit",
+    "Skip": "Anashkaloje",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Emrat e përdoruesve mund të përmbajnë vetëm shkronja, numra, pika, vija ndarëse dhe nënvija",
+    "Username not available": "Emri i përdoruesit s’është i lirë",
+    "Username invalid: %(errMessage)s": "Emër përdoruesi i pavlefshëm: %(errMessage)s",
+    "Username available": "Emri i përdoruesit është i lirë",
+    "Room contains unknown devices": "Dhoma përmban pajisje të panjohura",
+    "Unknown devices": "Pajisje të panjohura",
+    "Private Chat": "Fjalosje Private",
+    "Public Chat": "Fjalosje Publike",
+    "Custom": "Vetjak",
+    "Alias (optional)": "Alias (opsional)",
+    "Name": "Emër",
+    "Topic": "Temë",
+    "Make this room private": "Kaloje këtë dhomë si private",
+    "Encrypt room": "Fshehtëzoje dhomën",
+    "You must <a>register</a> to use this functionality": "Që të përdorni këtë funksion, duhet të <a>regjistroheni</a>",
+    "Add rooms to the community summary": "Shtoni dhoma te përmbledhja mbi bashkësinë",
+    "Add to summary": "Shtoje te përmbledhja",
+    "Add a Room": "Shtoni një Dhomë",
+    "Add users to the community summary": "Shtoni përdorues te përmbledhja mbi bashkësinë",
+    "Who would you like to add to this summary?": "Kë do të donit të shtonit te kjo përmbledhje?",
+    "Add a User": "Shtoni një Përdorues",
+    "Leave Community": "Braktiseni Bashkësinë",
+    "Leave %(groupName)s?": "Të braktiset {groupName}?",
+    "Community Settings": "Rregullime Bashkësie",
+    "%(inviter)s has invited you to join this community": "%s ju ftoi të bëheni pjesë e kësaj bashkësie",
+    "You are an administrator of this community": "Jeni një përgjegjës i kësaj bashkësie",
+    "You are a member of this community": "Jeni anëtar i këtij ekipi",
+    "Long Description (HTML)": "Përshkrim i Gjatë (HTML)",
+    "Description": "Përshkrim",
+    "Reject invitation": "Hidheni tej ftesën",
+    "Are you sure you want to reject the invitation?": "Jeni i sigurt se doni të hidhet tej kjo ftesë?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Jeni i sigurt se doni të dilni nga dhoma '%(roomName)s'?",
+    "Signed Out": "I dalë",
+    "Old cryptography data detected": "U pikasën të dhëna kriptografie të vjetër",
+    "Logout": "Dalje",
+    "Your Communities": "Bashkësitë Tuaja",
+    "Create a new community": "Krijoni një bashkësi të re",
+    "You have no visible notifications": "S’keni njoftime të dukshme.",
+    "%(count)s of your messages have not been sent.|other": "Disa nga mesazhet tuaj s’janë dërguar.",
+    "%(count)s of your messages have not been sent.|one": "Mesazhi juaj s’u dërgua.",
+    "%(count)s new messages|other": "%(count)s mesazhe të rinj",
+    "%(count)s new messages|one": "%(count)s mesazh i ri",
+    "Active call": "Thirrje aktive",
+    "You seem to be in a call, are you sure you want to quit?": "Duket se jeni në një thirrje, jeni i sigurt se doni të dilet?",
+    "Search failed": "Kërkimi shtoi",
+    "No more results": "Jo më tepër përfundime",
+    "Room": "Dhomë",
+    "Clear filter": "Pastroje filtrin",
+    "Uploading %(filename)s and %(count)s others|other": "Po ngarkohet %(filename)s dhe %(count)s të tjera",
+    "Uploading %(filename)s and %(count)s others|zero": "Po ngarkohet %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Po ngarkohet %(filename)s dhe %(count)s tjetër",
+    "Light theme": "Temë e çelët",
+    "Dark theme": "Temë e errët",
+    "Status.im theme": "Temë Status.im",
+    "Can't load user settings": "S’ngarkohen dot rregullime përdoruesi",
+    "Server may be unavailable or overloaded": "Shërbyesi mund të jetë i pakapshëm ose i mbingarkuar",
+    "Sign out": "Dilni",
+    "Success": "Sukses",
+    "Remove %(threePid)s?": "Të hiqet %(threePid)s?",
+    "Refer a friend to Riot:": "Tregojini një shoku për Riot-in:",
+    "Interface Language": "Gjuhë Ndërfaqeje",
+    "User Interface": "Ndërfaqe Përdoruesi",
+    "Cryptography": "Kriptografi",
+    "Device ID:": "ID Pajisjeje:",
+    "Device key:": "Kyç pajisjeje:",
+    "Ignored Users": "Përdorues të Shpërfillur",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.",
+    "These are experimental features that may break in unexpected ways": "Këto janë veçori eksperimentale që mund të ngecin në rrugë të papritura",
+    "Use with caution": "Përdoreni me masë",
+    "Deactivate my account": "Çaktivizoje llogarinë time",
+    "Clear Cache": "Pastroje Fshehtinën",
+    "Updates": "Përditësime",
+    "Check for update": "Kontrollo për përditësime",
+    "Bulk Options": "Veprime Masive",
+    "No media permissions": "S’ka leje mediash",
+    "No Microphones detected": "S’u pikasën Mikrofona",
+    "No Webcams detected": "S’u pikasën kamera",
+    "Default Device": "Pajisje Parazgjedhje",
+    "Microphone": "Mikrofon",
+    "Camera": "Kamerë",
+    "VoIP": "VOIP",
+    "Email": "Email",
+    "Add email address": "Shtoni adresë email",
+    "Profile": "Profil",
+    "Display name": "Emër në ekran",
+    "Account": "Llogari",
+    "Logged in as:": "I futur si:",
+    "Access Token:": "Token Hyrjesh:",
+    "Identity Server is": "Shërbyes Identitetesh është",
+    "riot-web version:": "Version riot-web:",
+    "olm version:": "version olm:",
+    "The email address linked to your account must be entered.": "Duhet dhënë adresa email e lidhur me llogarinë tuaj.",
+    "Your password has been reset": "Fjalëkalimi juaj u ricaktua",
+    "Return to login screen": "Kthehuni te skena e hyrjeve",
+    "New password": "Fjalëkalim i ri",
+    "Confirm your new password": "Ripohoni fjalëkalimin tuaj të ri",
+    "Send Reset Email": "Dërgo Email Ricaktimi",
+    "Create an account": "Krijoni një llogari",
+    "Incorrect username and/or password.": "Emër përdoruesi dhe/ose fjalëkalim i pasaktë.",
+    "The phone number entered looks invalid": "Numri i telefonit që u dha duket i pavlefshëm",
+    "Sign in to get started": "Që t’ia filloni, bëni hyrjen",
+    "Set a display name:": "Caktoni emër ekrani",
+    "Upload an avatar:": "Ngarkoni një avatar:",
+    "This server does not support authentication with a phone number.": "Ky shërbyes nuk mbulon mirëfilltësim me një numër telefoni.",
+    "Missing password.": "Mungon fjalëkalimi.",
+    "Passwords don't match.": "Fjalëkalimet s’përputhen.",
+    "This doesn't look like a valid email address.": "Kjo s’duket si adresë email e vlefshme.",
+    "This doesn't look like a valid phone number.": "Ky s’duket si numër telefoni i vlefshëm.",
+    "You need to enter a user name.": "Lypset të jepni një emër përdoruesi.",
+    "I already have an account": "Kam tashmë një llogari",
+    "Bans user with given id": "Dëbon përdoruesin me ID-në e dhënë",
+    "Unbans user with given id": "I heq dëbimin përdoruesit me ID-në e dhënë",
+    "Sets the room topic": "Caktoni temë dhome",
+    "Kicks user with given id": "Përzë përdoruesin me ID-në e dhënë",
+    "Opens the Developer Tools dialog": "Hap dialogun Mjete Zhvilluesi",
+    "Commands": "Urdhra",
+    "Results from DuckDuckGo": "Përfundimet vijnë nga DuckDuckGo",
+    "Notify the whole room": "Njofto krejt dhomën",
+    "Room Notification": "Njoftim Dhome",
+    "Users": "Përdorues",
+    "unknown device": "pajisje e panjohur",
+    "NOT verified": "JO e verifikua",
+    "verified": "e verifikuar",
+    "Verification": "Verifikim",
+    "User ID": "ID përdoruesi",
+    "Curve25519 identity key": "Kyç identiteti Curve25519",
+    "none": "asnjë",
+    "Algorithm": "Algoritëm",
+    "unencrypted": "të pafshehtëzuara",
+    "Decryption error": "Gabim shfshehtëzimi",
+    "Session ID": "ID sesioni",
+    "End-to-end encryption information": "Të dhëna fshehtëzimi skaj-më-skaj",
+    "Event information": "Të dhëna akti",
+    "Sender device information": "Të dhëna pajisjeje dërguesi",
+    "Passphrases must match": "Frazëkalimet duhet të përputhen",
+    "Passphrase must not be empty": "Frazëkalimi s’mund të jetë i zbrazët",
+    "Export room keys": "Eksporto kyçe dhome",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Ky proces ju lejon të eksportoni te një kartelë vendore kyçet për mesazhe që keni marrë në dhoma të fshehtëzuara. Mandej do të jeni në gjendje ta importoni kartelën te një tjetër klient Matrix në të ardhmen, që kështu ai klient të jetë në gjendje t’i fshehtëzojë këto mesazhe.",
+    "Enter passphrase": "Jepni frazëkalimin",
+    "Confirm passphrase": "Ripohoni frazëkalimin",
+    "Export": "Eksporto",
+    "Import room keys": "Importo kyçe dhome",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ky proces ju lejon të importoni kyçe fshehtëzimi që keni eksportuar më parë nga një tjetër klient Matrix. Mandej do të jeni në gjendje të shfshehtëzoni çfarëdo mesazhesh që mund të shfshehtëzojë ai klient tjetër.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Kartela e eksportit është e mbrojtur me një frazëkalim. Që të shfshehtëzoni kartelën, duhet ta jepni frazëkalimin këtu."
 }

From 1472b8f8d0ad002554c69200f48ab649c448fd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Wed, 14 Nov 2018 09:37:57 +0000
Subject: [PATCH 183/218] Translated using Weblate (French)

Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ff90878bce..cdb8f78931 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -102,7 +102,7 @@
     "Devices": "Appareils",
     "Devices will not yet be able to decrypt history from before they joined the room": "Les appareils ne pourront pas encore déchiffrer l'historique de messages d'avant leur arrivée sur le salon",
     "Failed to join room": "Échec de l’inscription au salon",
-    "Failed to kick": "Échec de l'exclusion",
+    "Failed to kick": "Échec de l'expulsion",
     "Failed to leave room": "Échec du départ du salon",
     "Failed to load timeline position": "Échec du chargement de la position dans l'historique",
     "Failed to mute user": "Échec de la mise en sourdine de l'utilisateur",
@@ -157,9 +157,9 @@
     "Join Room": "Rejoindre le salon",
     "%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
     "Joins room with given alias": "Rejoint le salon avec l'alias renseigné",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s a exclu %(targetName)s.",
-    "Kick": "Exclure",
-    "Kicks user with given id": "Exclut l'utilisateur à partir de son identifiant",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s a expulsé %(targetName)s.",
+    "Kick": "Expulser",
+    "Kicks user with given id": "Expulse l'utilisateur à partir de son identifiant",
     "Labs": "Laboratoire",
     "Leave room": "Quitter le salon",
     "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
@@ -592,7 +592,7 @@
     "Verified": "Vérifié",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Souhaitez-vous <acceptText>accepter</acceptText> ou <declineText>refuser</declineText> cette invitation ?",
     "You have been banned from %(roomName)s by %(userName)s.": "Vous avez été banni(e) de %(roomName)s par %(userName)s.",
-    "You have been kicked from %(roomName)s by %(userName)s.": "Vous avez été exclu de %(roomName)s par %(userName)s.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s vous a expulsé de %(roomName)s.",
     "You may wish to login with a different account, or add this email to this account.": "Vous souhaiteriez peut-être vous identifier avec un autre compte, ou ajouter cette e-mail à votre compte.",
     "Your home server does not support device management.": "Votre serveur d'accueil ne prend pas en charge la gestion d'appareils.",
     "(~%(count)s results)|one": "(~%(count)s résultat)",
@@ -637,7 +637,7 @@
     "Define the power level of a user": "Définir le rang d'un utilisateur",
     "Edit": "Modifier",
     "Enable automatic language detection for syntax highlighting": "Activer la détection automatique de la langue pour la correction orthographique",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Masquer les messages d'arrivée/départ (n'affecte pas les invitations/exclusions/bannissements)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Masquer les messages d'arrivée/départ (n'affecte pas les invitations/expulsions/bannissements)",
     "Revoke widget access": "Révoquer les accès du widget",
     "Sets the room topic": "Défini le sujet du salon",
     "To get started, please pick a username!": "Pour commencer, choisissez un nom d'utilisateur !",
@@ -719,7 +719,7 @@
     "Guests can join": "Les invités peuvent rejoindre le salon",
     "To invite users into the room, you must be a": "Pour inviter des utilisateurs dans le salon, vous devez être un(e)",
     "To configure the room, you must be a": "Pour configurer le salon, vous devez être un(e)",
-    "To kick users, you must be a": "Pour exclure des utilisateurs, vous devez être un(e)",
+    "To kick users, you must be a": "Pour expulser des utilisateurs, vous devez être",
     "To ban users, you must be a": "Pour bannir des utilisateurs, vous devez être un(e)",
     "To remove other users' messages, you must be a": "Pour supprimer les messages d'autres utilisateurs, vous devez être un(e)",
     "To send events of type <eventType/>, you must be a": "Pour envoyer des évènements du type <eventType/>, vous devez être un",
@@ -730,14 +730,14 @@
     "%(senderName)s sent a video": "%(senderName)s a envoyé une vidéo",
     "%(senderName)s uploaded a file": "%(senderName)s a transféré un fichier",
     "Disinvite this user?": "Désinviter l'utilisateur ?",
-    "Kick this user?": "Exclure cet utilisateur ?",
+    "Kick this user?": "Expulser cet utilisateur ?",
     "Unban this user?": "Révoquer le bannissement de cet utilisateur ?",
     "Ban this user?": "Bannir cet utilisateur ?",
     "Drop here to favourite": "Déposer ici pour mettre en favori",
     "Drop here to tag direct chat": "Déposer ici pour marquer comme conversation directe",
     "Drop here to restore": "Déposer ici pour restaurer",
     "Drop here to demote": "Déposer ici pour rétrograder",
-    "You have been kicked from this room by %(userName)s.": "Vous avez été exclu de ce salon par %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s vous a expulsé de ce salon.",
     "You have been banned from this room by %(userName)s.": "Vous avez été banni de ce salon par %(userName)s.",
     "You are trying to access a room.": "Vous essayez d'accéder à un salon.",
     "Members only (since the point in time of selecting this option)": "Seulement les membres (depuis la sélection de cette option)",
@@ -798,10 +798,10 @@
     "were unbanned %(count)s times|one": "ont vu leur bannissement révoqué",
     "was unbanned %(count)s times|other": "a vu son bannissement révoqué %(count)s fois",
     "was unbanned %(count)s times|one": "a vu son bannissement révoqué",
-    "were kicked %(count)s times|other": "ont été exclus %(count)s fois",
-    "were kicked %(count)s times|one": "ont été exclus",
-    "was kicked %(count)s times|other": "a été exclu %(count)s fois",
-    "was kicked %(count)s times|one": "a été exclu",
+    "were kicked %(count)s times|other": "ont été expulsés %(count)s fois",
+    "were kicked %(count)s times|one": "ont été expulsés",
+    "was kicked %(count)s times|other": "a été expulsé %(count)s fois",
+    "was kicked %(count)s times|one": "a été expulsé",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s ont changé de nom %(count)s fois",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s ont changé de nom",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s a changé de nom %(count)s fois",

From 41abc8dcdcbaac2b270d85e042280cde320bffe1 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkkx@protonmail.com>
Date: Tue, 13 Nov 2018 19:21:28 +0000
Subject: [PATCH 184/218] Translated using Weblate (Polish)

Currently translated at 93.5% (1194 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 53bbfcd496..045b04cc94 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -775,7 +775,7 @@
     "Failed to get protocol list from Home Server": "Nie można pobrać listy protokołów z serwera domowego",
     "You are not receiving desktop notifications": "Nie otrzymujesz powiadomień na pulpit",
     "Friday": "Piątek",
-    "Update": "Uaktualnienie",
+    "Update": "Zaktualizuj",
     "What's New": "Co nowego",
     "Add an email address above to configure email notifications": "Dodaj adres e-mail powyżej, aby skonfigurować powiadomienia e-mailowe",
     "Expand panel": "Rozwiń panel",

From f0fe1bd3a4193e637e1d45f23d851577e2faf059 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Nov 2018 12:18:53 +0000
Subject: [PATCH 185/218] Prepare changelog for v0.14.5-rc.1

---
 CHANGELOG.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a98991e38..a5b4fc2f55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,53 @@
+Changes in [0.14.5-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.5-rc.1) (2018-11-15)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.4...v0.14.5-rc.1)
+
+ * Update from Weblate.
+   [\#2278](https://github.com/matrix-org/matrix-react-sdk/pull/2278)
+ * Support room IDs and event permalinks in the join command
+   [\#2272](https://github.com/matrix-org/matrix-react-sdk/pull/2272)
+ * Align encrypted event buttons in Safari
+   [\#2274](https://github.com/matrix-org/matrix-react-sdk/pull/2274)
+ * Align buttons in encrypted event dialog
+   [\#2273](https://github.com/matrix-org/matrix-react-sdk/pull/2273)
+ * Add visible guest warning to encourage login
+   [\#2268](https://github.com/matrix-org/matrix-react-sdk/pull/2268)
+ * Regenerate the room list when m.fully_read is issued
+   [\#2266](https://github.com/matrix-org/matrix-react-sdk/pull/2266)
+ * Remove the request-only stuff we don't need anymore
+   [\#2263](https://github.com/matrix-org/matrix-react-sdk/pull/2263)
+ * Improve performance of room list and fix timestamp ordering when pinning
+   rooms
+   [\#2265](https://github.com/matrix-org/matrix-react-sdk/pull/2265)
+ * Add options to pin unread/mentioned rooms to the top of the room list
+   [\#1936](https://github.com/matrix-org/matrix-react-sdk/pull/1936)
+ * only run e2e tests on PRs targeted on develop
+   [\#2261](https://github.com/matrix-org/matrix-react-sdk/pull/2261)
+ * Fix and test matrix.to alias permalinks
+   [\#2254](https://github.com/matrix-org/matrix-react-sdk/pull/2254)
+ * click-through svg on tag tile context menu to make it less weird
+   [\#2257](https://github.com/matrix-org/matrix-react-sdk/pull/2257)
+ * Hide Matthew's Time Machine
+   [\#2256](https://github.com/matrix-org/matrix-react-sdk/pull/2256)
+ * Update babel-eslint to 8.1.1
+   [\#2255](https://github.com/matrix-org/matrix-react-sdk/pull/2255)
+ * Support routing matrix.to links to joinable rooms
+   [\#2250](https://github.com/matrix-org/matrix-react-sdk/pull/2250)
+ * Fix autoreplacement of ascii emoji
+   [\#2253](https://github.com/matrix-org/matrix-react-sdk/pull/2253)
+ * Repair DevTools button padding by centralizing styles
+   [\#2252](https://github.com/matrix-org/matrix-react-sdk/pull/2252)
+ * Redirect widgets to another location before deleting them
+   [\#2232](https://github.com/matrix-org/matrix-react-sdk/pull/2232)
+ * disable e2e tests for PRs targeted at experimental (redesign)
+   [\#2251](https://github.com/matrix-org/matrix-react-sdk/pull/2251)
+ * Fix emoji replacement in composer
+   [\#2247](https://github.com/matrix-org/matrix-react-sdk/pull/2247)
+ * Add a devtools button to roomsettings
+   [\#2249](https://github.com/matrix-org/matrix-react-sdk/pull/2249)
+ * Add warning when administrator leaves community (#5724)
+   [\#2242](https://github.com/matrix-org/matrix-react-sdk/pull/2242)
+
 Changes in [0.14.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.4) (2018-11-13)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.3...v0.14.4)

From fcf3172b18f99ca2d2626585eb0a758007cc4210 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Nov 2018 12:18:53 +0000
Subject: [PATCH 186/218] v0.14.5-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9a76821d91..6a69b1c23e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.4",
+  "version": "0.14.5-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 96ed7b123b136b0e809f15ee95c3f367dde1107b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Nov 2018 15:19:59 +0000
Subject: [PATCH 187/218] js-sdk rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6a69b1c23e..866d4654ce 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.13.1",
+    "matrix-js-sdk": "0.14.0-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From 3f308c23820e32f0d3f7a2e6ed862d7ee1c5208f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Nov 2018 15:29:24 +0000
Subject: [PATCH 188/218] Prepare changelog for v0.14.5-rc.2

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5b4fc2f55..b1281482fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.14.5-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.5-rc.2) (2018-11-15)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.5-rc.1...v0.14.5-rc.2)
+
+ * Update to js-sdk v0.14.0-rc.1 which uses the new Olm API
+   (v0.14.0-rc.1 was broken because of this).
+
 Changes in [0.14.5-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.5-rc.1) (2018-11-15)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.4...v0.14.5-rc.1)

From 8841108b6be9609667ebba0487b659968f323889 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Nov 2018 15:29:24 +0000
Subject: [PATCH 189/218] v0.14.5-rc.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 866d4654ce..9e0f515292 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.5-rc.1",
+  "version": "0.14.5-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 90f22c7b43d14c848052e62543d61e3775ccc29f Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 15 Nov 2018 19:05:39 +0000
Subject: [PATCH 190/218] Support for m.login.sso

Adds support for the m.login.sso login type, which is handled the same way as
CAS, and also makes it look a bit nicer.
---
 res/css/structures/login/_Login.scss     | 11 +++++++
 src/Login.js                             |  8 ++---
 src/components/structures/login/Login.js | 14 ++++-----
 src/components/views/login/CasLogin.js   | 38 ------------------------
 src/i18n/strings/en_EN.json              |  2 +-
 5 files changed, 21 insertions(+), 52 deletions(-)
 delete mode 100644 src/components/views/login/CasLogin.js

diff --git a/res/css/structures/login/_Login.scss b/res/css/structures/login/_Login.scss
index 84b8306a74..1264d2a30f 100644
--- a/res/css/structures/login/_Login.scss
+++ b/res/css/structures/login/_Login.scss
@@ -142,6 +142,17 @@ limitations under the License.
     color: $primary-fg-color;
 }
 
+.mx_Login_sso_link {
+    display: block;
+    text-align: center;
+    font-size: 15px;
+    margin-bottom: 20px;
+}
+
+.mx_Login_sso_link:link {
+    color: $primary-fg-color;
+}
+
 .mx_Login_loader {
     display: inline;
     position: relative;
diff --git a/src/Login.js b/src/Login.js
index 61a14959d8..ec55a1e8c7 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import Matrix from "matrix-js-sdk";
-import { _t } from "./languageHandler";
 
 import Promise from 'bluebird';
 import url from 'url';
@@ -225,19 +224,18 @@ export default class Login {
         });
     }
 
-    redirectToCas() {
+    getSsoLoginUrl(loginType) {
       const client = this._createTemporaryClient();
       const parsedUrl = url.parse(window.location.href, true);
 
       // XXX: at this point, the fragment will always be #/login, which is no
       // use to anyone. Ideally, we would get the intended fragment from
       // MatrixChat.screenAfterLogin so that you could follow #/room links etc
-      // through a CAS login.
+      // through an SSO login.
       parsedUrl.hash = "";
 
       parsedUrl.query["homeserver"] = client.getHomeserverUrl();
       parsedUrl.query["identityServer"] = client.getIdentityServerUrl();
-      const casUrl = client.getCasLoginUrl(url.format(parsedUrl));
-      window.location.href = casUrl;
+      return client.getSsoLoginUrl(url.format(parsedUrl), loginType);
     }
 }
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 45f523f141..92cddb0dc1 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -84,7 +84,10 @@ module.exports = React.createClass({
         // letting you do that login type
         this._stepRendererMap = {
             'm.login.password': this._renderPasswordStep,
-            'm.login.cas': this._renderCasStep,
+
+            // CAS and SSO are the same thing, modulo the url we link to
+            'm.login.cas': () => this._renderSsoStep(this._loginLogic.getSsoLoginUrl("cas")),
+            'm.login.sso': () => this._renderSsoStep(this._loginLogic.getSsoLoginUrl("sso")),
         };
 
         this._initLoginLogic();
@@ -186,10 +189,6 @@ module.exports = React.createClass({
         }).done();
     },
 
-    onCasLogin: function() {
-      this._loginLogic.redirectToCas();
-    },
-
     _onLoginAsGuestClick: function() {
         const self = this;
         self.setState({
@@ -403,10 +402,9 @@ module.exports = React.createClass({
         );
     },
 
-    _renderCasStep: function() {
-        const CasLogin = sdk.getComponent('login.CasLogin');
+    _renderSsoStep: function(url) {
         return (
-            <CasLogin onSubmit={this.onCasLogin} />
+            <a href={url} className="mx_Login_sso_link">{ _t('Sign in with single sign-on') }</a>
         );
     },
 
diff --git a/src/components/views/login/CasLogin.js b/src/components/views/login/CasLogin.js
deleted file mode 100644
index 9219c79733..0000000000
--- a/src/components/views/login/CasLogin.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket 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.
-*/
-
-'use strict';
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-
-module.exports = React.createClass({
-    displayName: 'CasLogin',
-
-    propTypes: {
-      onSubmit: PropTypes.func, // fn()
-    },
-
-    render: function() {
-        return (
-            <div>
-                <button onClick={this.props.onSubmit}>{ _t("Sign in with CAS") }</button>
-            </div>
-        );
-    },
-
-});
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 572cc0d2b3..1ae379404c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -638,7 +638,6 @@
     "Message removed": "Message removed",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
     "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
-    "Sign in with CAS": "Sign in with CAS",
     "Custom Server Options": "Custom Server Options",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "This allows you to use this app with an existing Matrix account on a different home server.",
@@ -1218,6 +1217,7 @@
     "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
+    "Sign in with single sign-on": "Sign in with single sign-on",
     "Try the app first": "Try the app first",
     "Sign in to get started": "Sign in to get started",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",

From 8916c90fed1ea88936cafce3a9bacb4e78e6068c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 15 Nov 2018 20:26:37 -0700
Subject: [PATCH 191/218] Make the 'Accept' button for consent a little more
 friendly

Part of https://github.com/vector-im/riot-web/issues/7700
---
 .../login/_InteractiveAuthEntryComponents.scss | 18 ++++++++++++++----
 res/themes/dark/css/_dark.scss                 |  1 +
 res/themes/light/css/_base.scss                |  1 +
 .../login/InteractiveAuthEntryComponents.js    |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/res/css/views/login/_InteractiveAuthEntryComponents.scss b/res/css/views/login/_InteractiveAuthEntryComponents.scss
index 11f55e69f8..e2ea7d86fb 100644
--- a/res/css/views/login/_InteractiveAuthEntryComponents.scss
+++ b/res/css/views/login/_InteractiveAuthEntryComponents.scss
@@ -30,19 +30,29 @@ limitations under the License.
     border: 1px solid $accent-color;
 }
 
-.mx_InteractiveAuthEntryComponents_msisdnSubmit,
-.mx_InteractiveAuthEntryComponents_termsSubmit {
+.mx_InteractiveAuthEntryComponents_msisdnSubmit {
     margin-top: 4px;
     margin-bottom: 5px;
 }
 
+.mx_InteractiveAuthEntryComponents_termsSubmit {
+    margin-top: 20px;
+    margin-bottom: 5px;
+    display: block;
+    width: 100%;
+}
+
 // XXX: This should be a common button class
-.mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled,
-.mx_InteractiveAuthEntryComponents_termsSubmit:disabled {
+.mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled {
     background-color: $light-fg-color;
     cursor: default;
 }
 
+.mx_InteractiveAuthEntryComponents_termsSubmit:disabled {
+    background-color: $accent-color-50pct;
+    cursor: default;
+}
+
 .mx_InteractiveAuthEntryComponents_termsPolicy {
     display: block;
 }
\ No newline at end of file
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 8ab338790e..d0594d820c 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -12,6 +12,7 @@ $light-fg-color: #747474;
 // button UI (white-on-green in light skin)
 $accent-fg-color: $primary-bg-color;
 $accent-color: #76CFA6;
+$accent-color-50pct: #76CFA67F;
 
 $selection-fg-color: $primary-fg-color;
 
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
index c7fd38259c..a6f28fd14b 100644
--- a/res/themes/light/css/_base.scss
+++ b/res/themes/light/css/_base.scss
@@ -18,6 +18,7 @@ $focus-bg-color: #dddddd;
 // button UI (white-on-green in light skin)
 $accent-fg-color: #ffffff;
 $accent-color: #76CFA6;
+$accent-color-50pct: #76CFA67F;
 
 $selection-fg-color: $primary-bg-color;
 
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index 26b93c9fbe..6c1d11f82a 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -335,7 +335,7 @@ export const TermsAuthEntry = React.createClass({
         if (!this.props.hideContinue) {
             // XXX: button classes
             submitButton = <button className="mx_InteractiveAuthEntryComponents_termsSubmit mx_UserSettings_button"
-                                   onClick={this._trySubmit}>{_t("Continue")}</button>;
+                                   onClick={this._trySubmit} disabled={!allChecked}>{_t("Accept")}</button>;
         }
 
         return (

From e112641524ac313f83008bcf2589edc386f4ed7b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Nov 2018 11:31:46 +0000
Subject: [PATCH 192/218] Handle crypto db version upgrade

Display a dialog telling the user what the situation is with
options to sign out or continue withwout e2e.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/785
---
 src/MatrixClientPeg.js      | 10 ++++++++++
 src/i18n/strings/en_EN.json | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 04b3b47e43..9a77901d2e 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -23,10 +23,12 @@ import Matrix from 'matrix-js-sdk';
 import utils from 'matrix-js-sdk/lib/utils';
 import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
 import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
+import sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
 import {phasedRollOutExpiredForUser} from "./PhasedRollOut";
+import Modal from './Modal';
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -116,6 +118,14 @@ class MatrixClientPeg {
                 await this.matrixClient.initCrypto();
             }
         } catch (e) {
+            if (e.name === 'InvalidCryptoStoreError') {
+                // The js-sdk found a crypto DB too new for it to use
+                const CryptoStoreTooNewDialog =
+                    sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog");
+                Modal.createDialog(CryptoStoreTooNewDialog, {
+                    host: window.location.host,
+                });
+            }
             // this can happen for a number of reasons, the most likely being
             // that the olm library was missing. It's not fatal.
             console.warn("Unable to initialise e2e: " + e);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 572cc0d2b3..06f834503b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -249,10 +249,11 @@
     "Enable URL previews for this room (only affects you)": "Enable URL previews for this room (only affects you)",
     "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room",
     "Room Colour": "Room Colour",
-    "Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list",
     "Pin rooms I'm mentioned in to the top of the room list": "Pin rooms I'm mentioned in to the top of the room list",
+    "Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Show empty room list headings": "Show empty room list headings",
+    "Show developer tools": "Show developer tools",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -553,6 +554,7 @@
     "Click here to fix": "Click here to fix",
     "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
+    "Open Devtools": "Open Devtools",
     "Who can access this room?": "Who can access this room?",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -849,6 +851,11 @@
     "Advanced options": "Advanced options",
     "Block users on other matrix homeservers from joining this room": "Block users on other matrix homeservers from joining this room",
     "This setting cannot be changed later!": "This setting cannot be changed later!",
+    "Sign out": "Sign out",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this",
+    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ",
+    "Incompatible Database": "Incompatible Database",
+    "Continue With Encryption Disabled": "Continue With Encryption Disabled",
     "Failed to indicate account erasure": "Failed to indicate account erasure",
     "Unknown error": "Unknown error",
     "Incorrect password": "Incorrect password",
@@ -903,7 +910,6 @@
     "Update any local room aliases to point to the new room": "Update any local room aliases to point to the new room",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Put a link back to the old room at the start of the new room so people can see old messages",
-    "Sign out": "Sign out",
     "Log out and remove encryption keys?": "Log out and remove encryption keys?",
     "Clear Storage and Sign Out": "Clear Storage and Sign Out",
     "Send Logs": "Send Logs",
@@ -927,9 +933,7 @@
     "Username available": "Username available",
     "To get started, please pick a username!": "To get started, please pick a username!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
-    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
-    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "You have successfully set a password!": "You have successfully set a password!",
     "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
     "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
@@ -1036,6 +1040,8 @@
     "This Home server does not support communities": "This Home server does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
     "Couldn't load home page": "Couldn't load home page",
+    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "Login": "Login",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
@@ -1272,7 +1278,5 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "Open Devtools": "Open Devtools",
-    "Show developer tools": "Show developer tools"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }

From 8281bdf8756dc859f73cf8373352966e1007be78 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Nov 2018 11:33:09 +0000
Subject: [PATCH 193/218] Actually add the dialog

---
 .../views/dialogs/CryptoStoreTooNewDialog.js  | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 src/components/views/dialogs/CryptoStoreTooNewDialog.js

diff --git a/src/components/views/dialogs/CryptoStoreTooNewDialog.js b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
new file mode 100644
index 0000000000..0146420f46
--- /dev/null
+++ b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
@@ -0,0 +1,71 @@
+/*
+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 React from 'react';
+import sdk from '../../../index';
+import dis from '../../../dispatcher';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+
+export default (props) => {
+    const _onLogoutClicked = () => {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        Modal.createTrackedDialog('Logout e2e db too new', '', QuestionDialog, {
+            title: _t("Sign out"),
+            description: _t(
+                "To avoid losing your chat history, you must export your room keys " +
+                "before logging out. You will need to go back to the newer version of " +
+                "Riot to do this",
+            ),
+            button: _t("Sign out"),
+            focus: false,
+            onFinished: (doLogout) => {
+                if (doLogout) {
+                    dis.dispatch({action: 'logout'});
+                    props.onFinished();
+                }
+            },
+        });
+    };
+
+    const description =
+        _t("You've previously used a newer version of Riot on %(host)s. " +
+            "To use this version again with end to end encryption, you will " +
+            "need to sign out and back in again. ",
+            {host: props.host},
+        );
+
+    const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+    const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    return (<BaseDialog className="mx_CryptoStoreTooNewDialog"
+        contentId='mx_Dialog_content'
+        title={_t("Incompatible Database")}
+        hasCancel={false}
+        onFinished={props.onFinished}
+    >
+        <div className="mx_Dialog_content" id='mx_Dialog_content'>
+            { description }
+        </div>
+        <DialogButtons primaryButton={_t('Continue With Encryption Disabled')}
+            hasCancel={false}
+            onPrimaryButtonClick={props.onFinished}
+        >
+            <button onClick={_onLogoutClicked} >
+                { _t('Sign out') }
+            </button>
+        </DialogButtons>
+    </BaseDialog>);
+};

From 7df003ef74dbbdcdac9047e278a145a974afffb6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 16 Nov 2018 12:15:44 -0700
Subject: [PATCH 194/218] Be more positive in property naming

---
 src/components/structures/InteractiveAuth.js                 | 2 +-
 src/components/views/login/InteractiveAuthEntryComponents.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 39e015f42e..2883c8cca4 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -203,7 +203,7 @@ export default React.createClass({
                 fail={this._onAuthStageFailed}
                 setEmailSid={this._setEmailSid}
                 makeRegistrationUrl={this.props.makeRegistrationUrl}
-                hideContinue={this.props.continueIsManaged}
+                showContinue={!this.props.continueIsManaged}
             />
         );
     },
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index 6c1d11f82a..73b46959b0 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -222,7 +222,7 @@ export const TermsAuthEntry = React.createClass({
         stageParams: PropTypes.object.isRequired,
         errorText: PropTypes.string,
         busy: PropTypes.bool,
-        hideContinue: PropTypes.bool,
+        showContinue: PropTypes.bool,
     },
 
     componentWillMount: function() {
@@ -332,7 +332,7 @@ export const TermsAuthEntry = React.createClass({
         }
 
         let submitButton;
-        if (!this.props.hideContinue) {
+        if (this.props.showContinue !== false) {
             // XXX: button classes
             submitButton = <button className="mx_InteractiveAuthEntryComponents_termsSubmit mx_UserSettings_button"
                                    onClick={this._trySubmit} disabled={!allChecked}>{_t("Accept")}</button>;

From 179b64d185e744566fe4e99ada8eb4830fe58c88 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Nov 2018 15:16:18 +0000
Subject: [PATCH 195/218] released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9e0f515292..43617a5db2 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.14.0-rc.1",
+    "matrix-js-sdk": "0.14.0",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From df928218d1a567318a570958ca3a4f4d62e3951e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Nov 2018 15:19:16 +0000
Subject: [PATCH 196/218] Prepare changelog for v0.14.5

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1281482fd..1486578025 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.14.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.5) (2018-11-19)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.5-rc.2...v0.14.5)
+
+ * No changes since rc.1
+
 Changes in [0.14.5-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.5-rc.2) (2018-11-15)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.5-rc.1...v0.14.5-rc.2)

From 0165a33f9f867409115a7421781b9fe59bd9945e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Nov 2018 15:19:17 +0000
Subject: [PATCH 197/218] v0.14.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 43617a5db2..d2e54a2621 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.5-rc.2",
+  "version": "0.14.5",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From fbab8ceeef0d4e313d58a774915452718ed475bf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Nov 2018 13:11:58 +0000
Subject: [PATCH 198/218] Passphrase based key backups

Add passphrase support to backup creation stage
---
 res/css/_common.scss                          |   5 +
 res/css/_components.scss                      |   1 +
 .../keybackup/_CreateKeyBackupDialog.scss     |  39 +++
 .../keybackup/CreateKeyBackupDialog.js        | 302 ++++++++++++++----
 src/i18n/strings/en_EN.json                   |  46 ++-
 5 files changed, 316 insertions(+), 77 deletions(-)
 create mode 100644 res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 9123e5ba8d..11e04f5dc0 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -262,6 +262,11 @@ textarea {
     opacity: 0.7;
 }
 
+.mx_linkButton {
+    cursor: pointer;
+    color: $accent-color;
+}
+
 .mx_Dialog_title {
     min-height: 16px;
     padding-top: 40px;
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 9fd524104d..039bcd545b 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -46,6 +46,7 @@
 @import "./views/dialogs/_SetPasswordDialog.scss";
 @import "./views/dialogs/_ShareDialog.scss";
 @import "./views/dialogs/_UnknownDeviceDialog.scss";
+@import "./views/dialogs/keybackup/_CreateKeyBackupDialog.scss";
 @import "./views/directory/_NetworkDropdown.scss";
 @import "./views/elements/_AccessibleButton.scss";
 @import "./views/elements/_AddressSelector.scss";
diff --git a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
new file mode 100644
index 0000000000..507c89ace7
--- /dev/null
+++ b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
@@ -0,0 +1,39 @@
+/*
+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.
+*/
+ 
+.mx_CreateKeyBackupDialog_primaryContainer {
+    /*FIXME: plinth colour in new theme(s). background-color: $accent-color;*/
+    padding: 20px
+}
+
+.mx_CreateKeyBackupDialog_passPhraseInput {
+    width: 300px;
+    border: 1px solid $accent-color;
+    border-radius: 5px;
+    padding: 10px;
+}
+
+.mx_CreateKeyBackupDialog_passPhraseMatch {
+    float: right;
+}
+
+.mx_CreateKeyBackupDialog_recoveryKeyButtons {
+    float: right;
+}
+
+.mx_CreateKeyBackupDialog_recoveryKey {
+    width: 300px;
+}
diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index e561fe033c..ad68e15293 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -21,12 +21,13 @@ import Promise from 'bluebird';
 
 import { _t, _td } from '../../../../languageHandler';
 
-const PHASE_INTRO = 0;
-const PHASE_GENERATING = 1;
+const PHASE_PASSPHRASE = 0;
+const PHASE_PASSPHRASE_CONFIRM = 1;
 const PHASE_SHOWKEY = 2;
-const PHASE_MAKEBACKUP = 3;
-const PHASE_UPLOAD = 4;
+const PHASE_KEEPITSAFE = 3;
+const PHASE_BACKINGUP = 4;
 const PHASE_DONE = 5;
+const PHASE_OPTOUT_CONFIRM = 6;
 
 // XXX: copied from ShareDialog: factor out into utils
 function selectText(target) {
@@ -39,13 +40,16 @@ function selectText(target) {
 }
 
 /**
- * Walks the user through the process of creating an e22 key backup
+ * Walks the user through the process of creating an e2e key backup
  * on the server.
  */
 export default React.createClass({
     getInitialState: function() {
         return {
-            phase: PHASE_INTRO,
+            phase: PHASE_PASSPHRASE,
+            passPhrase: '',
+            passPhraseConfirm: '',
+            copied: false,
         };
     },
 
@@ -58,25 +62,25 @@ export default React.createClass({
         this._recoveryKeyNode = n;
     },
 
-    _copyRecoveryKey: function() {
+    _onCopyClick: function() {
         selectText(this._recoveryKeyNode);
         const successful = document.execCommand('copy');
         if (successful) {
-            this.setState({copied: true});
+            this.setState({
+                copied: true,
+                phase: PHASE_KEEPITSAFE,
+            });
         }
     },
 
     _createBackup: function() {
         this.setState({
-            phase: PHASE_MAKEBACKUP,
+            phase: PHASE_BACKINGUP,
             error: null,
         });
         this._createBackupPromise = MatrixClientPeg.get().createKeyBackupVersion(
             this._keyBackupInfo,
         ).then((info) => {
-            this.setState({
-                phase: PHASE_UPLOAD,
-            });
             return MatrixClientPeg.get().backupAllGroupSessions(info.version);
         }).then(() => {
             this.setState({
@@ -98,61 +102,203 @@ export default React.createClass({
         this.props.onFinished(true);
     },
 
-    _generateKey: async function() {
+    _onOptOutClick: function() {
+        this.setState({phase: PHASE_OPTOUT_CONFIRM});
+    },
+
+    _onSetUpClick: function() {
+        this.setState({phase: PHASE_PASSPHRASE});
+    },
+
+    _onSkipPassPhraseClick: async function() {
+        this._keyBackupInfo = await MatrixClientPeg.get().prepareKeyBackupVersion();
         this.setState({
-            phase: PHASE_GENERATING,
+            copied: false,
+            phase: PHASE_SHOWKEY,
         });
-        // Look, work is being done!
-        await Promise.delay(1200);
-        this._keyBackupInfo = MatrixClientPeg.get().prepareKeyBackupVersion();
+    },
+
+    _onPassPhraseNextClick: function() {
+        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+    },
+
+    _onPassPhraseKeyPress: function(e) {
+        if (e.key === 'Enter') {
+            this._onPassPhraseNextClick();
+        }
+    },
+
+    _onPassPhraseConfirmNextClick: async function() {
+        this._keyBackupInfo = await MatrixClientPeg.get().prepareKeyBackupVersion(this.state.passPhrase);
+        this.setState({
+            copied: false,
+            phase: PHASE_SHOWKEY,
+        });
+    },
+
+    _onPassPhraseConfirmKeyPress: function(e) {
+        if (e.key === 'Enter') {
+            this._onPassPhraseConfirmNextClick();
+        }
+    },
+
+    _onSetAgainClick: function() {
+        this.setState({
+            passPhrase: '',
+            passPhraseConfirm: '',
+            phase: PHASE_PASSPHRASE,
+        });
+    },
+
+    _onKeepItSafeGotItClick: function() {
         this.setState({
             phase: PHASE_SHOWKEY,
         });
     },
 
-    _renderPhaseIntro: function() {
+    _onPassPhraseChange: function(e) {
+        this.setState({
+            passPhrase: e.target.value,
+        });
+    },
+
+    _onPassPhraseConfirmChange: function(e) {
+        this.setState({
+            passPhraseConfirm: e.target.value,
+        });
+    },
+
+    _renderPhasePassPhrase: function() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        return <div>
+            <p>{_t("Secure your encrypted message history with a Recovery Passphrase.")}</p>
+            <p>{_t("You'll need it if you log out or lose access to this device.")}</p>
+
+            <div className="mx_CreateKeyBackupDialog_primaryContainer">
+                <input type="password"
+                    onChange={this._onPassPhraseChange}
+                    onKeyPress={this._onPassPhraseKeyPress}
+                    value={this.state.passPhrase}
+                    className="mx_CreateKeyBackupDialog_passPhraseInput"
+                    placeholder={_t("Enter a passphrase...")}
+                />
+            </div>
+
+            <DialogButtons primaryButton={_t('Next')}
+                onPrimaryButtonClick={this._onPassPhraseNextClick}
+                hasCancel={false}
+                disabled={this.state.passPhrase === ''}
+            />
+
+            <p>{_t(
+                "If you don't want encrypted message history to be availble on other devices, "+
+                "<button>opt out</button>.",
+                {},
+                {
+                    button: sub => <AccessibleButton element="span" className="mx_linkButton" onClick={this._onOptOutClick}>{sub}</AccessibleButton>,
+                },
+            )}</p>
+            <p>{_t(
+                "Or, if you don't want to create a Recovery Passphrase, skip this step and "+
+                "<button>download a recovery key</button>.",
+                {},
+                {
+                    button: sub => <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSkipPassPhraseClick}>{sub}</AccessibleButton>,
+                },
+            )}</p>
+        </div>;
+    },
+
+    _renderPhasePassPhraseConfirm: function() {
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+
+        let passPhraseMatch = null;
+        if (this.state.passPhraseConfirm.length > 0) {
+            let matchText;
+            if (this.state.passPhraseConfirm === this.state.passPhrase) {
+                matchText = _t("That matches!");
+            } else {
+                matchText = _t("That doesn't match.");
+            }
+            passPhraseMatch = <div className="mx_CreateKeyBackupDialog_passPhraseMatch">
+                <div>{matchText}</div>
+                <div>
+                    <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
+                        {_t("Go back to set it again.")}
+                    </AccessibleButton>
+                </div>
+            </div>;
+        }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            <p>To avoid ever losing your encrypted message history, you
-            can save your encryption keys on the server, protected by a recovery key.
+            <p>
+                Type in your Recovery Passphrase to confirm you remember it.
+                If it helps, add it to your password manager or store it
+                somewhere safe.
             </p>
-            <p>To maximise security, your recovery key is never stored by the app,
-            so you must store it yourself somewhere safe.</p>
-            <p>Warning: storing your encryption keys on the server means that
-            if someone gains access to your account and also steals your recovery key,
-            they will be able to read all of your encrypted conversation history.
-            </p>
-
-            <p>Do you wish to generate a recovery key and backup your encryption
-            keys on the server?</p>
-
-            <DialogButtons primaryButton={_t('Generate recovery key')}
-                onPrimaryButtonClick={this._generateKey}
-                onCancel={this._onCancel}
-                cancelButton={_t("I'll stick to manual backups")}
+            <div className="mx_CreateKeyBackupDialog_primaryContainer">
+                {passPhraseMatch}
+                <div>
+                    <input type="password"
+                        onChange={this._onPassPhraseConfirmChange}
+                        onKeyPress={this._onPassPhraseConfirmKeyPress}
+                        value={this.state.passPhraseConfirm}
+                        className="mx_CreateKeyBackupDialog_passPhraseInput"
+                        placeholder={_t("Repeat your passphrase...")}
+                        autoFocus={true}
+                    />
+                </div>
+            </div>
+            <DialogButtons primaryButton={_t('Next')}
+                onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
+                hasCancel={false}
+                disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
             />
         </div>;
     },
 
     _renderPhaseShowKey: function() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            <p>{_t("Here is your recovery key:")}</p>
-            <p className="mx_CreateKeyBackupDialog_recoveryKey">
-                <code ref={this._collectRecoveryKeyNode}>{this._keyBackupInfo.recovery_key}</code>
+            <p>{_t("Make a copy of this Recovery Key and keep it safe.")}</p>
+            <p>{_t("As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.")}</p>
+            <p className="mx_CreateKeyBackupDialog_primaryContainer">
+                <div>{_t("Your Recovery Key")}</div>
+                <div className="mx_CreateKeyBackupDialog_recoveryKeyButtons">
+                    <button onClick={this._onCopyClick}>
+                        {this.state.copied ? _t("Copied!") : _t("Copy to clipboard")}
+                    </button>
+                </div>
+                <div className="mx_CreateKeyBackupDialog_recoveryKey">
+                    <code ref={this._collectRecoveryKeyNode}>{this._keyBackupInfo.recovery_key}</code>
+                </div>
             </p>
-            <p>{_t("This key can decrypt your full message history.")}</p>
-            <p>{_t(
-                "When you've saved it somewhere safe, proceed to the next step where the key will be used to "+
-                "create an encrypted backup of your message keys and then destroyed.",
-            )}</p>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this._copyRecoveryKey}>
-                    {this.state.copied ? _t("Copied!") : _t("Copy to clipboard")}
-                </button>
-                <button onClick={this._createBackup}>
-                    {_t("Proceed")}
-                </button>
-            </div>
+            <DialogButtons primaryButton={_t("I've made a copy")}
+                onPrimaryButtonClick={this._createBackup}
+                hasCancel={false}
+                disabled={!this.state.copied}
+            />
+        </div>;
+    },
+
+    _renderPhaseKeepItSafe: function() {
+        let introText;
+        if (this.state.copied) {
+            introText = _t("Your Recovery Key has been copied to your clipboard, paste it to:");
+        }
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            {introText}
+            <ul>
+                <li>{_t("<b>Print it</b> and store it somewhere safe", {}, {b: s => <b>{s}</b>})}</li>
+                <li>{_t("<b>Save it</b> on a USB key or backup drive", {}, {b: s => <b>{s}</b>})}</li>
+                <li>{_t("<b>Copy it</b> to your personal cloud storage", {}, {b: s => <b>{s}</b>})}</li>
+            </ul>
+            <DialogButtons primaryButton={_t("Got it")}
+                onPrimaryButtonClick={this._onKeepItSafeGotItClick}
+                hasCancel={false}
+            />
         </div>;
     },
 
@@ -176,6 +322,39 @@ export default React.createClass({
         </div>;
     },
 
+    _renderPhaseOptOutConfirm: function() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            Without setting up Secure Message Recovery, you won't be able to restore your
+            encrypted message history if you log out or use another device.
+            <DialogButtons primaryButton={_t('Set up Secure Message Recovery')}
+                onPrimaryButtonClick={this._onSetUpClick}
+                hasCancel={false}
+            >
+                <button onClick={this._onCancel}>I understand, continue without</button>
+            </DialogButtons>
+        </div>;
+    },
+
+    _titleForPhase: function(phase) {
+        switch (phase) {
+            case PHASE_PASSPHRASE:
+                return _t('Create a Recovery Passphrase');
+            case PHASE_PASSPHRASE_CONFIRM:
+                return _t('Confirm Recovery Passphrase');
+            case PHASE_OPTOUT_CONFIRM:
+                return _t('Warning!');
+            case PHASE_SHOWKEY:
+                return _t('Recovery Key');
+            case PHASE_KEEPITSAFE:
+                return _t('Keep it safe');
+            case PHASE_BACKINGUP:
+                return _t('Backing up...');
+            default:
+                return _t("Create Key Backup");
+        }
+    },
+
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
@@ -194,32 +373,35 @@ export default React.createClass({
             </div>;
         } else {
             switch (this.state.phase) {
-                case PHASE_INTRO:
-                    content = this._renderPhaseIntro();
+                case PHASE_PASSPHRASE:
+                    content = this._renderPhasePassPhrase();
                     break;
-                case PHASE_GENERATING:
-                    content = this._renderBusyPhase(_td("Generating recovery key..."));
+                case PHASE_PASSPHRASE_CONFIRM:
+                    content = this._renderPhasePassPhraseConfirm();
                     break;
                 case PHASE_SHOWKEY:
                     content = this._renderPhaseShowKey();
                     break;
-                case PHASE_MAKEBACKUP:
-                    content = this._renderBusyPhase(_td("Creating backup..."));
+                case PHASE_KEEPITSAFE:
+                    content = this._renderPhaseKeepItSafe();
                     break;
-                case PHASE_UPLOAD:
-                    content = this._renderBusyPhase(_td("Uploading keys..."));
+                case PHASE_BACKINGUP:
+                    content = this._renderBusyPhase(_td("Backing up..."));
                     break;
                 case PHASE_DONE:
                     content = this._renderPhaseDone();
                     break;
+                case PHASE_OPTOUT_CONFIRM:
+                    content = this._renderPhaseOptOutConfirm();
+                    break;
             }
         }
 
         return (
             <BaseDialog className='mx_CreateKeyBackupDialog'
                 onFinished={this.props.onFinished}
-                title={_t('Create Key Backup')}
-                hasCancel={[PHASE_INTRO, PHASE_DONE].includes(this.state.phase)}
+                title={this._titleForPhase(this.state.phase)}
+                hasCancel={[PHASE_DONE].includes(this.state.phase)}
             >
             <div>
                 {content}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3da5ff15a2..cac9b4ef59 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -252,6 +252,7 @@
     "Room Colour": "Room Colour",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Show empty room list headings": "Show empty room list headings",
+    "Show developer tools": "Show developer tools",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -570,6 +571,7 @@
     "Click here to fix": "Click here to fix",
     "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
+    "Open Devtools": "Open Devtools",
     "Who can access this room?": "Who can access this room?",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -959,30 +961,42 @@
     "Share Room Message": "Share Room Message",
     "Link to selected message": "Link to selected message",
     "COPY": "COPY",
-    "Restore encryption keys": "Restore encryption keys",
-    "Verify this device": "Verify this device",
-    "Restore from online backup": "Restore from online backup",
-    "Restore from offline backup": "Restore from offline backup",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
     "Room contains unknown devices": "Room contains unknown devices",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contains devices that you haven't seen before.",
     "Unknown devices": "Unknown devices",
-    "Generate recovery key": "Generate recovery key",
-    "I'll stick to manual backups": "I'll stick to manual backups",
-    "Here is your recovery key:": "Here is your recovery key:",
-    "This key can decrypt your full message history.": "This key can decrypt your full message history.",
-    "When you've saved it somewhere safe, proceed to the next step where the key will be used to create an encrypted backup of your message keys and then destroyed.": "When you've saved it somewhere safe, proceed to the next step where the key will be used to create an encrypted backup of your message keys and then destroyed.",
+    "Secure your encrypted message history with a Recovery Passphrase.": "Secure your encrypted message history with a Recovery Passphrase.",
+    "You'll need it if you log out or lose access to this device.": "You'll need it if you log out or lose access to this device.",
+    "Enter a passphrase...": "Enter a passphrase...",
+    "Next": "Next",
+    "If you don't want encrypted message history to be availble on other devices, <button>opt out</button>.": "If you don't want encrypted message history to be availble on other devices, <button>opt out</button>.",
+    "Or, if you don't want to create a Recovery Passphrase, skip this step and <button>download a recovery key</button>.": "Or, if you don't want to create a Recovery Passphrase, skip this step and <button>download a recovery key</button>.",
+    "That matches!": "That matches!",
+    "That doesn't match.": "That doesn't match.",
+    "Go back to set it again.": "Go back to set it again.",
+    "Repeat your passphrase...": "Repeat your passphrase...",
+    "Make a copy of this Recovery Key and keep it safe.": "Make a copy of this Recovery Key and keep it safe.",
+    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.",
+    "Your Recovery Key": "Your Recovery Key",
     "Copy to clipboard": "Copy to clipboard",
-    "Proceed": "Proceed",
+    "I've made a copy": "I've made a copy",
+    "Your Recovery Key has been copied to your clipboard, paste it to:": "Your Recovery Key has been copied to your clipboard, paste it to:",
+    "<b>Print it</b> and store it somewhere safe": "<b>Print it</b> and store it somewhere safe",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Save it</b> on a USB key or backup drive",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Copy it</b> to your personal cloud storage",
+    "Got it": "Got it",
     "Backup created": "Backup created",
     "Your encryption keys are now being backed up to your Homeserver.": "Your encryption keys are now being backed up to your Homeserver.",
+    "Set up Secure Message Recovery": "Set up Secure Message Recovery",
+    "Create a Recovery Passphrase": "Create a Recovery Passphrase",
+    "Confirm Recovery Passphrase": "Confirm Recovery Passphrase",
+    "Recovery Key": "Recovery Key",
+    "Keep it safe": "Keep it safe",
+    "Backing up...": "Backing up...",
+    "Create Key Backup": "Create Key Backup",
     "Unable to create key backup": "Unable to create key backup",
     "Retry": "Retry",
-    "Generating recovery key...": "Generating recovery key...",
-    "Creating backup...": "Creating backup...",
-    "Uploading keys...": "Uploading keys...",
-    "Create Key Backup": "Create Key Backup",
     "Unable to load backup status": "Unable to load backup status",
     "Unable to restore backup": "Unable to restore backup",
     "No backup found!": "No backup found!",
@@ -1316,7 +1330,5 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "Open Devtools": "Open Devtools",
-    "Show developer tools": "Show developer tools"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }

From 132408cf02512a90c97903714ee33c4217640ab6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Nov 2018 16:16:24 +0000
Subject: [PATCH 199/218] Add e2e backup recovery with passphrase

---
 res/css/_components.scss                      |   1 +
 .../keybackup/_RestoreKeyBackupDialog.scss    |  29 +++
 .../keybackup/RestoreKeyBackupDialog.js       | 170 ++++++++++++++++--
 src/i18n/strings/en_EN.json                   |  10 +-
 4 files changed, 188 insertions(+), 22 deletions(-)
 create mode 100644 res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 039bcd545b..083071ef6c 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -47,6 +47,7 @@
 @import "./views/dialogs/_ShareDialog.scss";
 @import "./views/dialogs/_UnknownDeviceDialog.scss";
 @import "./views/dialogs/keybackup/_CreateKeyBackupDialog.scss";
+@import "./views/dialogs/keybackup/_RestoreKeyBackupDialog.scss";
 @import "./views/directory/_NetworkDropdown.scss";
 @import "./views/elements/_AccessibleButton.scss";
 @import "./views/elements/_AddressSelector.scss";
diff --git a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
new file mode 100644
index 0000000000..612c921038
--- /dev/null
+++ b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
@@ -0,0 +1,29 @@
+/*
+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.
+*/
+ 
+.mx_RestoreKeyBackupDialog_primaryContainer {
+    /*FIXME: plinth colour in new theme(s). background-color: $accent-color;*/
+    padding: 20px
+}
+
+.mx_RestoreKeyBackupDialog_passPhraseInput,
+.mx_RestoreKeyBackupDialog_recoveryKeyInput {
+    width: 300px;
+    border: 1px solid $accent-color;
+    border-radius: 5px;
+    padding: 10px;
+}
+
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 9e5e61cb1a..e4250814d0 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
+import Modal from '../../../../Modal';
 
 import { _t } from '../../../../languageHandler';
 
@@ -33,6 +34,9 @@ export default React.createClass({
             recoveryKey: "",
             recoverInfo: null,
             recoveryKeyValid: false,
+            forceRecoveryKey: false,
+            passPhrase: '',
+            recoveryKey: '',
         };
     },
 
@@ -48,6 +52,18 @@ export default React.createClass({
         this.props.onFinished(true);
     },
 
+    _onUseRecoveryKeyClick: function() {
+        this.setState({
+            forceRecoveryKey: true,
+        });
+    },
+
+    _onResetRecoveryClick: function() {
+        this.props.onFinished(false);
+        const CreateKeyBackupDialog = sdk.getComponent("dialogs.keybackup.CreateKeyBackupDialog");
+        Modal.createTrackedDialog('Create Key Backup', '', CreateKeyBackupDialog, {});
+    },
+
     _onRecoveryKeyChange: function(e) {
         this.setState({
             recoveryKey: e.target.value,
@@ -55,13 +71,35 @@ export default React.createClass({
         });
     },
 
-    _onRecoverClick: async function() {
+    _onPassPhraseNext: async function() {
         this.setState({
             loading: true,
             restoreError: null,
         });
         try {
-            const recoverInfo = await MatrixClientPeg.get().restoreKeyBackups(
+            const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithPassword(
+                this.state.passPhrase, undefined, undefined, this.state.backupInfo.version,
+            );
+            this.setState({
+                loading: false,
+                recoverInfo,
+            });
+        } catch (e) {
+            console.log("Error restoring backup", e);
+            this.setState({
+                loading: false,
+                restoreError: e,
+            });
+        }
+    },
+
+    _onRecoveryKeyNext: async function() {
+        this.setState({
+            loading: true,
+            restoreError: null,
+        });
+        try {
+            const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithRecoveryKey(
                 this.state.recoveryKey, undefined, undefined, this.state.backupInfo.version,
             );
             this.setState({
@@ -77,6 +115,24 @@ export default React.createClass({
         }
     },
 
+    _onPassPhraseChange: function(e) {
+        this.setState({
+            passPhrase: e.target.value,
+        });
+    },
+
+    _onPassPhraseKeyPress: function(e) {
+        if (e.key === "Enter") {
+            this._onPassPhraseNext();
+        }
+    },
+
+    _onRecoveryKeyKeyPress: function(e) {
+        if (e.key === "Enter" && this.state.recoveryKeyValid) {
+            this._onRecoveryKeyNext();
+        }
+    },
+
     _loadBackupStatus: async function() {
         this.setState({
             loading: true,
@@ -102,16 +158,29 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const Spinner = sdk.getComponent("elements.Spinner");
 
+        const backupHasPassphrase = (
+            this.state.backupInfo &&
+            this.state.backupInfo.auth_data &&
+            this.state.backupInfo.auth_data.private_key_salt &&
+            this.state.backupInfo.auth_data.private_key_iterations
+        );
+
         let content;
+        let title;
         if (this.state.loading) {
+            title = _t("Loading...");
             content = <Spinner />;
         } else if (this.state.loadError) {
+            title = _t("Error");
             content = _t("Unable to load backup status");
         } else if (this.state.restoreError) {
+            title = _t("Error");
             content = _t("Unable to restore backup");
         } else if (this.state.backupInfo === null) {
+            title = _t("Error");
             content = _t("No backup found!");
         } else if (this.state.recoverInfo) {
+            title = _t("Backup Restored");
             let failedToDecrypt;
             if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
                 failedToDecrypt = <p>{_t(
@@ -123,8 +192,54 @@ export default React.createClass({
                 <p>{_t("Restored %(sessionCount)s session keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
             </div>;
-        } else {
+        } else if (backupHasPassphrase && !this.state.forceRecoveryKey) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+            title = _t("Enter Recovery Passphrase");
+            content = <div>
+                {_t(
+                    "Access your secure message history and set up secure " +
+                    "messaging by entering your recovery passphrase.",
+                )}<br />
+
+                <div className="mx_RestoreKeyBackupDialog_primaryContainer">
+                    <input type="password"
+                        className="mx_RestoreKeyBackupDialog_passPhraseInput"
+                        onChange={this._onPassPhraseChange}
+                        onKeyPress={this._onPassPhraseKeyPress}
+                        value={this.state.passPhrase}
+                        autoFocus={true}
+                    />
+                    <DialogButtons primaryButton={_t('Next')}
+                        onPrimaryButtonClick={this._onPassPhraseNext}
+                        hasCancel={true}
+                        onCancel={this._onCancel}
+                        focus={false}
+                    />
+                </div>
+                {_t(
+                    "If you've forgotten your recovery passphrase you can "+
+                    "<button1>use your recovery key</button1> or " +
+                    "<button2>set up new recovery options</button2>"
+                , {}, {
+                    button1: s => <AccessibleButton className="mx_linkButton"
+                        element="span"
+                        onClick={this._onUseRecoveryKeyClick}
+                    >
+                        {s}
+                    </AccessibleButton>,
+                    button2: s => <AccessibleButton className="mx_linkButton"
+                        element="span"
+                        onClick={this._onResetRecoveryClick}
+                    >
+                        {s}
+                    </AccessibleButton>,
+                })}
+            </div>;
+        } else {
+            title = _t("Enter Recovery Key");
+            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
             let keyStatus;
             if (this.state.recoveryKey.length === 0) {
@@ -140,28 +255,45 @@ export default React.createClass({
             }
 
             content = <div>
-                {_t("Please enter the recovery key generated when you set up key backup")}<br />
-                <textarea
-                    onChange={this._onRecoveryKeyChange}
-                    value={this.state.recoveryKey}
-                    style={{width: "90%"}}
-                    autoFocus={true}
-                />
-                {keyStatus}
-                <DialogButtons primaryButton={_t('Recover')}
-                    onPrimaryButtonClick={this._onRecoverClick}
-                    hasCancel={true}
-                    onCancel={this._onCancel}
-                    focus={false}
-                    primaryDisabled={!this.state.recoveryKeyValid}
-                />
+                {_t(
+                    "Access your secure message history and set up secure " +
+                    "messaging by entering your recovery key.",
+                )}<br />
+
+                <div className="mx_RestoreKeyBackupDialog_primaryContainer">
+                    <input className="mx_RestoreKeyBackupDialog_recoveryKeyInput"
+                        onChange={this._onRecoveryKeyChange}
+                        onKeyPress={this._onRecoveryKeyKeyPress}
+                        value={this.state.recoveryKey}
+                        autoFocus={true}
+                    />
+                    {keyStatus}
+                    <DialogButtons primaryButton={_t('Next')}
+                        onPrimaryButtonClick={this._onRecoveryKeyNext}
+                        hasCancel={true}
+                        onCancel={this._onCancel}
+                        focus={false}
+                        primaryDisabled={!this.state.recoveryKeyValid}
+                    />
+                </div>
+                {_t(
+                    "If you've forgotten your recovery passphrase you can "+
+                    "<button>set up new recovery options</button>"
+                , {}, {
+                    button: s => <AccessibleButton className="mx_linkButton"
+                        element="span"
+                        onClick={this._onResetRecoveryClick}
+                    >
+                        {s}
+                    </AccessibleButton>,
+                })}
             </div>;
         }
 
         return (
             <BaseDialog className='mx_RestoreKeyBackupDialog'
                 onFinished={this.props.onFinished}
-                title={_t('Restore Key Backup')}
+                title={title}
             >
             <div>
                 {content}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cac9b4ef59..58e10ff149 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1000,13 +1000,17 @@
     "Unable to load backup status": "Unable to load backup status",
     "Unable to restore backup": "Unable to restore backup",
     "No backup found!": "No backup found!",
+    "Backup Restored": "Backup Restored",
     "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
     "Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
+    "Enter Recovery Passphrase": "Enter Recovery Passphrase",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Access your secure message history and set up secure messaging by entering your recovery passphrase.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>",
+    "Enter Recovery Key": "Enter Recovery Key",
     "This looks like a valid recovery key!": "This looks like a valid recovery key!",
     "Not a valid recovery key": "Not a valid recovery key",
-    "Please enter the recovery key generated when you set up key backup": "Please enter the recovery key generated when you set up key backup",
-    "Recover": "Recover",
-    "Restore Key Backup": "Restore Key Backup",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Access your secure message history and set up secure messaging by entering your recovery key.",
+    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>",
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
     "Custom": "Custom",

From 63a7ff5273185aca994ab5b3c3c6a2589ed6a354 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Nov 2018 16:20:31 +0000
Subject: [PATCH 200/218] lint

---
 .../dialogs/keybackup/CreateKeyBackupDialog.js  | 17 ++++++++++++++---
 .../dialogs/keybackup/RestoreKeyBackupDialog.js |  1 -
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index ad68e15293..aeb0c33b67 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
-import Promise from 'bluebird';
 
 import { _t, _td } from '../../../../languageHandler';
 
@@ -196,7 +195,13 @@ export default React.createClass({
                 "<button>opt out</button>.",
                 {},
                 {
-                    button: sub => <AccessibleButton element="span" className="mx_linkButton" onClick={this._onOptOutClick}>{sub}</AccessibleButton>,
+                    button: sub => <AccessibleButton
+                        element="span"
+                        className="mx_linkButton"
+                        onClick={this._onOptOutClick}
+                    >
+                        {sub}
+                    </AccessibleButton>,
                 },
             )}</p>
             <p>{_t(
@@ -204,7 +209,13 @@ export default React.createClass({
                 "<button>download a recovery key</button>.",
                 {},
                 {
-                    button: sub => <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSkipPassPhraseClick}>{sub}</AccessibleButton>,
+                    button: sub => <AccessibleButton
+                        element="span"
+                        className="mx_linkButton"
+                        onClick={this._onSkipPassPhraseClick}
+                    >
+                        {sub}
+                    </AccessibleButton>,
                 },
             )}</p>
         </div>;
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index e4250814d0..0cce968d34 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -36,7 +36,6 @@ export default React.createClass({
             recoveryKeyValid: false,
             forceRecoveryKey: false,
             passPhrase: '',
-            recoveryKey: '',
         };
     },
 

From ed5d87e797d458e2149d914021d36f352c3aa202 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 13:57:31 +0000
Subject: [PATCH 201/218] Add recovery key download button

---
 .../keybackup/CreateKeyBackupDialog.js        | 35 +++++++++++++++++--
 src/i18n/strings/en_EN.json                   |  4 ++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index aeb0c33b67..9dfcdb1f2b 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -18,6 +18,8 @@ import React from 'react';
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 
+import FileSaver from 'file-saver';
+
 import { _t, _td } from '../../../../languageHandler';
 
 const PHASE_PASSPHRASE = 0;
@@ -49,6 +51,7 @@ export default React.createClass({
             passPhrase: '',
             passPhraseConfirm: '',
             copied: false,
+            downloaded: false,
         };
     },
 
@@ -72,6 +75,18 @@ export default React.createClass({
         }
     },
 
+    _onDownloadClick: function() {
+        const blob = new Blob([this._keyBackupInfo.recovery_key], {
+            type: 'text/plain;charset=us-ascii',
+        });
+        FileSaver.saveAs(blob, 'recovery-key.txt');
+
+        this.setState({
+            downloaded: true,
+            phase: PHASE_KEEPITSAFE,
+        });
+    },
+
     _createBackup: function() {
         this.setState({
             phase: PHASE_BACKINGUP,
@@ -278,13 +293,21 @@ export default React.createClass({
                 <div>{_t("Your Recovery Key")}</div>
                 <div className="mx_CreateKeyBackupDialog_recoveryKeyButtons">
                     <button onClick={this._onCopyClick}>
-                        {this.state.copied ? _t("Copied!") : _t("Copy to clipboard")}
+                        {_t("Copy to clipboard")}
+                    </button>
+                    {
+                        // FIXME REDESIGN: buttons should be adjacent but insufficient room in current design
+                    }
+                    <br /><br />
+                    <button onClick={this._onDownloadClick}>
+                        {_t("Download")}
                     </button>
                 </div>
                 <div className="mx_CreateKeyBackupDialog_recoveryKey">
                     <code ref={this._collectRecoveryKeyNode}>{this._keyBackupInfo.recovery_key}</code>
                 </div>
             </p>
+            <br />
             <DialogButtons primaryButton={_t("I've made a copy")}
                 onPrimaryButtonClick={this._createBackup}
                 hasCancel={false}
@@ -296,7 +319,15 @@ export default React.createClass({
     _renderPhaseKeepItSafe: function() {
         let introText;
         if (this.state.copied) {
-            introText = _t("Your Recovery Key has been copied to your clipboard, paste it to:");
+            introText = _t(
+                "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:",
+                {}, {b: s => <b>{s}</b>},
+            );
+        } else if (this.state.downloaded) {
+            introText = _t(
+                "Your Recovery Key is in your <b>Downloads</b> folder.",
+                {}, {b: s => <b>{s}</b>},
+            );
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index be713bdb37..20618e305e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -986,8 +986,10 @@
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.",
     "Your Recovery Key": "Your Recovery Key",
     "Copy to clipboard": "Copy to clipboard",
+    "Download": "Download",
     "I've made a copy": "I've made a copy",
-    "Your Recovery Key has been copied to your clipboard, paste it to:": "Your Recovery Key has been copied to your clipboard, paste it to:",
+    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:",
+    "Your Recovery Key is in your <b>Downloads</b> folder.": "Your Recovery Key is in your <b>Downloads</b> folder.",
     "<b>Print it</b> and store it somewhere safe": "<b>Print it</b> and store it somewhere safe",
     "<b>Save it</b> on a USB key or backup drive": "<b>Save it</b> on a USB key or backup drive",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copy it</b> to your personal cloud storage",

From 985966f8beada6d3d0c47d173ab871c2d4e6a377 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 16:56:44 +0000
Subject: [PATCH 202/218] Update async dialog interface to use promises

Hopefully makes the syntax a bit nicer. Also uses ES6 async import
rather than require.ensure which is now deprecated. Also also
displays an error if the component fails to load rather than falling
over in a heap, which is nice.
---
 .babelrc                                      |  2 +-
 package.json                                  |  1 +
 src/Modal.js                                  | 46 ++++++++++++++-----
 src/components/structures/UserSettings.js     | 26 +++++------
 .../structures/login/ForgotPassword.js        | 13 +++---
 src/components/views/rooms/EventTile.js       |  9 ++--
 .../views/settings/ChangePassword.js          | 13 +++---
 src/i18n/strings/en_EN.json                   |  3 +-
 8 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/.babelrc b/.babelrc
index 6ba0e0dae0..fc5bd1788f 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,4 @@
 {
   "presets": ["react", "es2015", "es2016"],
-  "plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-bluebird", "transform-runtime", "add-module-exports"]
+  "plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-bluebird", "transform-runtime", "add-module-exports", "syntax-dynamic-import"]
 }
diff --git a/package.json b/package.json
index d2e54a2621..b0b3f57746 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "test-multi": "karma start"
   },
   "dependencies": {
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-runtime": "^6.26.0",
     "bluebird": "^3.5.0",
     "blueimp-canvas-to-blob": "^3.5.0",
diff --git a/src/Modal.js b/src/Modal.js
index 06a96824a7..f7b10041a6 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -23,6 +23,7 @@ import PropTypes from 'prop-types';
 import Analytics from './Analytics';
 import sdk from './index';
 import dis from './dispatcher';
+import { _t } from './languageHandler';
 
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
 
@@ -32,15 +33,15 @@ const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
  */
 const AsyncWrapper = React.createClass({
     propTypes: {
-        /** A function which takes a 'callback' argument which it will call
-         * with the real component once it loads.
+        /** A promise which resolves with the real component
          */
-        loader: PropTypes.func.isRequired,
+        prom: PropTypes.object.isRequired,
     },
 
     getInitialState: function() {
         return {
             component: null,
+            error: null,
         };
     },
 
@@ -49,14 +50,20 @@ const AsyncWrapper = React.createClass({
         // XXX: temporary logging to try to diagnose
         // https://github.com/vector-im/riot-web/issues/3148
         console.log('Starting load of AsyncWrapper for modal');
-        this.props.loader((e) => {
+        this.props.prom.then((result) => {
             // XXX: temporary logging to try to diagnose
             // https://github.com/vector-im/riot-web/issues/3148
-            console.log('AsyncWrapper load completed with '+e.displayName);
+            console.log('AsyncWrapper load completed with '+result.displayName);
             if (this._unmounted) {
                 return;
             }
-            this.setState({component: e});
+            // Take the 'default' member if it's there, then we support
+            // passing in just an import()ed module, since ES6 async import
+            // always returns a module *namespace*.
+            const component = result.default ? result.default : result;
+            this.setState({component});
+        }).catch((e) => {
+            this.setState({error: e});
         });
     },
 
@@ -64,11 +71,27 @@ const AsyncWrapper = React.createClass({
         this._unmounted = true;
     },
 
+    _onWrapperCancelClick: function() {
+        this.props.onFinished(false);
+    },
+
     render: function() {
         const {loader, ...otherProps} = this.props;
         if (this.state.component) {
             const Component = this.state.component;
             return <Component {...otherProps} />;
+        } else if (this.state.error) {
+            const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+            return <BaseDialog onFinished={this.props.onFinished}
+                title={_t("Error")}
+            >
+                {_t("Unable to load! Check your network connectivity and try again.")}
+                <DialogButtons primaryButton={_t("Dismiss")}
+                    onPrimaryButtonClick={this._onWrapperCancelClick}
+                    hasCancel={false}
+                />
+            </BaseDialog>;
         } else {
             // show a spinner until the component is loaded.
             const Spinner = sdk.getComponent("elements.Spinner");
@@ -115,7 +138,7 @@ class ModalManager {
     }
 
     createDialog(Element, ...rest) {
-        return this.createDialogAsync((cb) => {cb(Element);}, ...rest);
+        return this.createDialogAsync(new Promise(resolve => resolve(Element)), ...rest);
     }
 
     createTrackedDialogAsync(analyticsAction, analyticsInfo, ...rest) {
@@ -133,9 +156,8 @@ class ModalManager {
      *       require(['<module>'], cb);
      *   }
      *
-     * @param {Function} loader   a function which takes a 'callback' argument,
-     *   which it should call with a React component which will be displayed as
-     *   the modal view.
+     * @param {Promise} prom   a promise which resolves with a React component
+     *   which will be displayed as the modal view.
      *
      * @param {Object} props   properties to pass to the displayed
      *    component. (We will also pass an 'onFinished' property.)
@@ -147,7 +169,7 @@ class ModalManager {
      *                                  Also, when closed, all modals will be removed
      *                                  from the stack.
      */
-    createDialogAsync(loader, props, className, isPriorityModal) {
+    createDialogAsync(prom, props, className, isPriorityModal) {
         const self = this;
         const modal = {};
 
@@ -178,7 +200,7 @@ class ModalManager {
         // FIXME: If a dialog uses getDefaultProps it clobbers the onFinished
         // property set here so you can't close the dialog from a button click!
         modal.elem = (
-            <AsyncWrapper key={modalCount} loader={loader} {...props}
+            <AsyncWrapper key={modalCount} prom={prom} {...props}
                 onFinished={closeDialog} />
         );
         modal.onFinished = props ? props.onFinished : null;
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index db12515285..c02e482746 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -589,23 +589,21 @@ module.exports = React.createClass({
     },
 
     _onExportE2eKeysClicked: function() {
-        Modal.createTrackedDialogAsync('Export E2E Keys', '', (cb) => {
-            require.ensure(['../../async-components/views/dialogs/ExportE2eKeysDialog'], () => {
-                cb(require('../../async-components/views/dialogs/ExportE2eKeysDialog'));
-            }, "e2e-export");
-        }, {
-            matrixClient: MatrixClientPeg.get(),
-        });
+        Modal.createTrackedDialogAsync('Export E2E Keys', '',
+            import('../../async-components/views/dialogs/ExportE2eKeysDialog'),
+            {
+                matrixClient: MatrixClientPeg.get(),
+            },
+        );
     },
 
     _onImportE2eKeysClicked: function() {
-        Modal.createTrackedDialogAsync('Import E2E Keys', '', (cb) => {
-            require.ensure(['../../async-components/views/dialogs/ImportE2eKeysDialog'], () => {
-                cb(require('../../async-components/views/dialogs/ImportE2eKeysDialog'));
-            }, "e2e-export");
-        }, {
-            matrixClient: MatrixClientPeg.get(),
-        });
+        Modal.createTrackedDialogAsync('Import E2E Keys', '',
+            import('../../async-components/views/dialogs/ImportE2eKeysDialog'),
+            {
+                matrixClient: MatrixClientPeg.get(),
+            },
+        );
     },
 
     _renderGroupSettings: function() {
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index 7e0cd5da8e..444f391258 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -121,13 +121,12 @@ module.exports = React.createClass({
     },
 
     _onExportE2eKeysClicked: function() {
-        Modal.createTrackedDialogAsync('Export E2E Keys', 'Forgot Password', (cb) => {
-            require.ensure(['../../../async-components/views/dialogs/ExportE2eKeysDialog'], () => {
-                cb(require('../../../async-components/views/dialogs/ExportE2eKeysDialog'));
-            }, "e2e-export");
-        }, {
-            matrixClient: MatrixClientPeg.get(),
-        });
+        Modal.createTrackedDialogAsync('Export E2E Keys', 'Forgot Password',
+            import('../../../async-components/views/dialogs/ExportE2eKeysDialog'),
+            {
+                matrixClient: MatrixClientPeg.get(),
+            },
+        );
     },
 
     onInputChanged: function(stateKey, ev) {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 53c73c8f84..e978bf438a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -416,11 +416,10 @@ module.exports = withMatrixClient(React.createClass({
     onCryptoClicked: function(e) {
         const event = this.props.mxEvent;
 
-        Modal.createTrackedDialogAsync('Encrypted Event Dialog', '', (cb) => {
-            require(['../../../async-components/views/dialogs/EncryptedEventDialog'], cb);
-        }, {
-            event: event,
-        });
+        Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
+            import('../../../async-components/views/dialogs/EncryptedEventDialog'),
+            {event},
+        );
     },
 
     onRequestKeysClick: function() {
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index b2ffe531b5..77c7810436 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -179,13 +179,12 @@ module.exports = React.createClass({
     },
 
     _onExportE2eKeysClicked: function() {
-        Modal.createTrackedDialogAsync('Export E2E Keys', 'Change Password', (cb) => {
-            require.ensure(['../../../async-components/views/dialogs/ExportE2eKeysDialog'], () => {
-                cb(require('../../../async-components/views/dialogs/ExportE2eKeysDialog'));
-            }, "e2e-export");
-        }, {
-            matrixClient: MatrixClientPeg.get(),
-        });
+        Modal.createTrackedDialogAsync('Export E2E Keys', 'Change Password',
+            import('../../../async-components/views/dialogs/ExportE2eKeysDialog'),
+            {
+                matrixClient: MatrixClientPeg.get(),
+            },
+        );
     },
 
     onClickChange: function(ev) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3dc0bb6b0a..01c4926467 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -82,6 +82,8 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
+    "Dismiss": "Dismiss",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
     "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -644,7 +646,6 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "This allows you to use this app with an existing Matrix account on a different home server.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "You can also set a custom identity server but this will typically prevent interaction with users based on email address.",
-    "Dismiss": "Dismiss",
     "To continue, please enter your password.": "To continue, please enter your password.",
     "Password:": "Password:",
     "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",

From 2ba4d8a2d912ea407ca2dbaf8b92a4d5d82bc27d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 17:35:28 +0000
Subject: [PATCH 203/218] Remove outdated logging & log on failure

---
 src/Modal.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index f7b10041a6..960e0e5c30 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -51,9 +51,6 @@ const AsyncWrapper = React.createClass({
         // https://github.com/vector-im/riot-web/issues/3148
         console.log('Starting load of AsyncWrapper for modal');
         this.props.prom.then((result) => {
-            // XXX: temporary logging to try to diagnose
-            // https://github.com/vector-im/riot-web/issues/3148
-            console.log('AsyncWrapper load completed with '+result.displayName);
             if (this._unmounted) {
                 return;
             }
@@ -63,6 +60,7 @@ const AsyncWrapper = React.createClass({
             const component = result.default ? result.default : result;
             this.setState({component});
         }).catch((e) => {
+            console.warn('AsyncWrapper promise failed', e);
             this.setState({error: e});
         });
     },

From 08e2ba8c6c704aa1ad7e3aab76918ffbca3aa889 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 18:02:58 +0000
Subject: [PATCH 204/218] Don't allow enter to submit if field invalid

---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index aeb0c33b67..eec4c9f414 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -122,7 +122,7 @@ export default React.createClass({
     },
 
     _onPassPhraseKeyPress: function(e) {
-        if (e.key === 'Enter') {
+        if (e.key === 'Enter' && this._passPhraseIsValid()) {
             this._onPassPhraseNextClick();
         }
     },
@@ -136,7 +136,7 @@ export default React.createClass({
     },
 
     _onPassPhraseConfirmKeyPress: function(e) {
-        if (e.key === 'Enter') {
+        if (e.key === 'Enter' && this.state.passPhrase === this.state.passPhraseConfirm) {
             this._onPassPhraseConfirmNextClick();
         }
     },
@@ -167,6 +167,10 @@ export default React.createClass({
         });
     },
 
+    _passPhraseIsValid: function() {
+        return this.state.passPhrase !== '';
+    },
+
     _renderPhasePassPhrase: function() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
@@ -187,7 +191,7 @@ export default React.createClass({
             <DialogButtons primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
-                disabled={this.state.passPhrase === ''}
+                disabled={!this._passPhraseIsValid()}
             />
 
             <p>{_t(

From 1c06d781aea46a31e4918b2401e9749e300b628b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 18:06:37 +0000
Subject: [PATCH 205/218] Missed translation

---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js   | 10 +++++-----
 src/i18n/strings/en_EN.json                            |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index eec4c9f414..4a5ba67514 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -247,11 +247,11 @@ export default React.createClass({
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            <p>
-                Type in your Recovery Passphrase to confirm you remember it.
-                If it helps, add it to your password manager or store it
-                somewhere safe.
-            </p>
+            <p>{_t(
+                "Type in your Recovery Passphrase to confirm you remember it. " +
+                "If it helps, add it to your password manager or store it " +
+                "somewhere safe.",
+            )}</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 {passPhraseMatch}
                 <div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index be713bdb37..ba2df1052a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -981,6 +981,7 @@
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",
     "Go back to set it again.": "Go back to set it again.",
+    "Type in your Recovery Passphrase to confirm you remember it. If it helps, add it to your password manager or store it somewhere safe.": "Type in your Recovery Passphrase to confirm you remember it. If it helps, add it to your password manager or store it somewhere safe.",
     "Repeat your passphrase...": "Repeat your passphrase...",
     "Make a copy of this Recovery Key and keep it safe.": "Make a copy of this Recovery Key and keep it safe.",
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.",

From 40ef2e0cf4d42f36d4ba51eef9b14d69c0efc42a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 18:08:44 +0000
Subject: [PATCH 206/218] another missed translation

---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js        | 6 ++++--
 src/i18n/strings/en_EN.json                                 | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 4a5ba67514..8601463e80 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -340,8 +340,10 @@ export default React.createClass({
     _renderPhaseOptOutConfirm: function() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
-            Without setting up Secure Message Recovery, you won't be able to restore your
-            encrypted message history if you log out or use another device.
+            {_t(
+                "Without setting up Secure Message Recovery, you won't be able to restore your " +
+                "encrypted message history if you log out or use another device."
+            )}
             <DialogButtons primaryButton={_t('Set up Secure Message Recovery')}
                 onPrimaryButtonClick={this._onSetUpClick}
                 hasCancel={false}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ba2df1052a..f11c5e22f4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -995,6 +995,7 @@
     "Got it": "Got it",
     "Backup created": "Backup created",
     "Your encryption keys are now being backed up to your Homeserver.": "Your encryption keys are now being backed up to your Homeserver.",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another device.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another device.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
     "Create a Recovery Passphrase": "Create a Recovery Passphrase",
     "Confirm Recovery Passphrase": "Confirm Recovery Passphrase",

From 3828798099a7aa1f96d327ecf87d790be6e571cf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 18:17:26 +0000
Subject: [PATCH 207/218] lint

---
 src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 8601463e80..a3ef8e7f19 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -342,7 +342,7 @@ export default React.createClass({
         return <div>
             {_t(
                 "Without setting up Secure Message Recovery, you won't be able to restore your " +
-                "encrypted message history if you log out or use another device."
+                "encrypted message history if you log out or use another device.",
             )}
             <DialogButtons primaryButton={_t('Set up Secure Message Recovery')}
                 onPrimaryButtonClick={this._onSetUpClick}

From 23d935fd784ed622ee10a155a4f256326092b939 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Nov 2018 18:53:18 +0000
Subject: [PATCH 208/218] Let's use a version of node we can download rather
 than dig up

---
 jenkins.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins.sh b/jenkins.sh
index 8cf5ee4a1f..f4bb8da449 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -4,7 +4,7 @@ set -e
 
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-nvm use 6
+nvm use 10
 
 set -x
 

From 4cfefe4c3c58bca6a19ed12b06fa8df86fcd875d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 21 Nov 2018 14:13:56 -0700
Subject: [PATCH 209/218] Introduce an onUsernameBlur and fix hostname parsing

---
 src/components/structures/login/Login.js    | 20 +++++++++++++++++---
 src/components/views/login/PasswordLogin.js |  5 +++--
 src/i18n/strings/en_EN.json                 |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 67d9bb7d38..fae7cc37df 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -232,11 +232,24 @@ module.exports = React.createClass({
         }).done();
     },
 
-    onUsernameChanged: function(username, endOfInput) {
+    onUsernameChanged: function(username) {
         this.setState({ username: username });
-        if (username[0] === "@" && endOfInput) {
+    },
+
+    onUsernameBlur: function(username) {
+        this.setState({ username: username });
+        if (username[0] === "@") {
             const serverName = username.split(':').slice(1).join(':');
-            this._tryWellKnownDiscovery(serverName);
+            try {
+                // we have to append 'https://' to make the URL constructor happy
+                // otherwise we get things like 'protocol: matrix.org, pathname: 8448'
+                const url = new URL("https://" + serverName);
+                this._tryWellKnownDiscovery(url.hostname);
+            } catch (e) {
+                console.error("Problem parsing URL or unhandled error doing .well-known discovery");
+                console.error(e);
+                this.setState({discoveryError: _t("Failed to perform homeserver discovery")});
+            }
         }
     },
 
@@ -531,6 +544,7 @@ module.exports = React.createClass({
                initialPhoneCountry={this.state.phoneCountry}
                initialPhoneNumber={this.state.phoneNumber}
                onUsernameChanged={this.onUsernameChanged}
+               onUsernameBlur={this.onUsernameBlur}
                onPhoneCountryChanged={this.onPhoneCountryChanged}
                onPhoneNumberChanged={this.onPhoneNumberChanged}
                onForgotPasswordClick={this.props.onForgotPasswordClick}
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 0e3aed1187..6a5577fb62 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -30,6 +30,7 @@ class PasswordLogin extends React.Component {
     static defaultProps = {
         onError: function() {},
         onUsernameChanged: function() {},
+        onUsernameBlur: function() {},
         onPasswordChanged: function() {},
         onPhoneCountryChanged: function() {},
         onPhoneNumberChanged: function() {},
@@ -122,11 +123,11 @@ class PasswordLogin extends React.Component {
 
     onUsernameChanged(ev) {
         this.setState({username: ev.target.value});
-        this.props.onUsernameChanged(ev.target.value, false);
+        this.props.onUsernameChanged(ev.target.value);
     }
 
     onUsernameBlur(ev) {
-        this.props.onUsernameChanged(this.state.username, true);
+        this.props.onUsernameBlur(this.state.username);
     }
 
     onLoginTypeChange(loginType) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index eb0a7fb1db..f9980f5645 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1288,6 +1288,7 @@
     "Incorrect username and/or password.": "Incorrect username and/or password.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
     "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
+    "Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
     "The phone number entered looks invalid": "The phone number entered looks invalid",
     "Invalid homeserver discovery response": "Invalid homeserver discovery response",
     "Cannot find homeserver": "Cannot find homeserver",

From 5600a9d02adc61f9420234a4090d9342743443db Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 21 Nov 2018 14:14:08 -0700
Subject: [PATCH 210/218] Validate the identity server

---
 src/components/structures/login/Login.js | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index fae7cc37df..6002f058f4 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -115,11 +115,6 @@ module.exports = React.createClass({
         // discovery went wrong
         if (this.state.discoveryError) return;
 
-        if (this.state.discoveredHsUrl) {
-            console.log("Rewriting username because the homeserver was discovered");
-            username = username.substring(1).split(":")[0];
-        }
-
         this.setState({
             busy: true,
             errorText: null,
@@ -327,16 +322,13 @@ module.exports = React.createClass({
                     return;
                 }
 
-                // XXX: We don't verify the identity server URL because sydent doesn't register
-                // the route we need.
-
-                // console.log("Verifying identity server URL: " + isUrl);
-                // const isResponse = await this._getWellKnownObject(`${isUrl}/_matrix/identity/api/v1`);
-                // if (!isResponse) {
-                //     console.error("Invalid /api/v1 response");
-                //     this.setState({discoveryError: _t("Invalid homeserver discovery response")});
-                //     return;
-                // }
+                console.log("Verifying identity server URL: " + isUrl);
+                const isResponse = await this._getWellKnownObject(`${isUrl}/_matrix/identity/api/v1`);
+                if (!isResponse) {
+                    console.error("Invalid /api/v1 response");
+                    this.setState({discoveryError: _t("Invalid homeserver discovery response")});
+                    return;
+                }
             }
 
             this.setState({discoveredHsUrl: hsUrl, discoveredIsUrl: isUrl, discoveryError: ""});

From a8db02ff0253332fd532719a2fe19ddae49a5be9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Nov 2018 11:31:46 +0000
Subject: [PATCH 211/218] Handle crypto db version upgrade

Display a dialog telling the user what the situation is with
options to sign out or continue withwout e2e.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/785
---
 src/MatrixClientPeg.js      | 10 ++++++++++
 src/i18n/strings/en_EN.json | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 04b3b47e43..9a77901d2e 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -23,10 +23,12 @@ import Matrix from 'matrix-js-sdk';
 import utils from 'matrix-js-sdk/lib/utils';
 import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
 import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
+import sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
 import {phasedRollOutExpiredForUser} from "./PhasedRollOut";
+import Modal from './Modal';
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -116,6 +118,14 @@ class MatrixClientPeg {
                 await this.matrixClient.initCrypto();
             }
         } catch (e) {
+            if (e.name === 'InvalidCryptoStoreError') {
+                // The js-sdk found a crypto DB too new for it to use
+                const CryptoStoreTooNewDialog =
+                    sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog");
+                Modal.createDialog(CryptoStoreTooNewDialog, {
+                    host: window.location.host,
+                });
+            }
             // this can happen for a number of reasons, the most likely being
             // that the olm library was missing. It's not fatal.
             console.warn("Unable to initialise e2e: " + e);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 572cc0d2b3..06f834503b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -249,10 +249,11 @@
     "Enable URL previews for this room (only affects you)": "Enable URL previews for this room (only affects you)",
     "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room",
     "Room Colour": "Room Colour",
-    "Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list",
     "Pin rooms I'm mentioned in to the top of the room list": "Pin rooms I'm mentioned in to the top of the room list",
+    "Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list",
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Show empty room list headings": "Show empty room list headings",
+    "Show developer tools": "Show developer tools",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -553,6 +554,7 @@
     "Click here to fix": "Click here to fix",
     "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
+    "Open Devtools": "Open Devtools",
     "Who can access this room?": "Who can access this room?",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -849,6 +851,11 @@
     "Advanced options": "Advanced options",
     "Block users on other matrix homeservers from joining this room": "Block users on other matrix homeservers from joining this room",
     "This setting cannot be changed later!": "This setting cannot be changed later!",
+    "Sign out": "Sign out",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this",
+    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ",
+    "Incompatible Database": "Incompatible Database",
+    "Continue With Encryption Disabled": "Continue With Encryption Disabled",
     "Failed to indicate account erasure": "Failed to indicate account erasure",
     "Unknown error": "Unknown error",
     "Incorrect password": "Incorrect password",
@@ -903,7 +910,6 @@
     "Update any local room aliases to point to the new room": "Update any local room aliases to point to the new room",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Put a link back to the old room at the start of the new room so people can see old messages",
-    "Sign out": "Sign out",
     "Log out and remove encryption keys?": "Log out and remove encryption keys?",
     "Clear Storage and Sign Out": "Clear Storage and Sign Out",
     "Send Logs": "Send Logs",
@@ -927,9 +933,7 @@
     "Username available": "Username available",
     "To get started, please pick a username!": "To get started, please pick a username!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
-    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
-    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "You have successfully set a password!": "You have successfully set a password!",
     "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
     "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
@@ -1036,6 +1040,8 @@
     "This Home server does not support communities": "This Home server does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
     "Couldn't load home page": "Couldn't load home page",
+    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
+    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "Login": "Login",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
@@ -1272,7 +1278,5 @@
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-    "Open Devtools": "Open Devtools",
-    "Show developer tools": "Show developer tools"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }

From ab40a0b264e90b51024df3a88e35cc413109b635 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Nov 2018 11:33:09 +0000
Subject: [PATCH 212/218] Actually add the dialog

---
 .../views/dialogs/CryptoStoreTooNewDialog.js  | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 src/components/views/dialogs/CryptoStoreTooNewDialog.js

diff --git a/src/components/views/dialogs/CryptoStoreTooNewDialog.js b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
new file mode 100644
index 0000000000..0146420f46
--- /dev/null
+++ b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
@@ -0,0 +1,71 @@
+/*
+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 React from 'react';
+import sdk from '../../../index';
+import dis from '../../../dispatcher';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+
+export default (props) => {
+    const _onLogoutClicked = () => {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        Modal.createTrackedDialog('Logout e2e db too new', '', QuestionDialog, {
+            title: _t("Sign out"),
+            description: _t(
+                "To avoid losing your chat history, you must export your room keys " +
+                "before logging out. You will need to go back to the newer version of " +
+                "Riot to do this",
+            ),
+            button: _t("Sign out"),
+            focus: false,
+            onFinished: (doLogout) => {
+                if (doLogout) {
+                    dis.dispatch({action: 'logout'});
+                    props.onFinished();
+                }
+            },
+        });
+    };
+
+    const description =
+        _t("You've previously used a newer version of Riot on %(host)s. " +
+            "To use this version again with end to end encryption, you will " +
+            "need to sign out and back in again. ",
+            {host: props.host},
+        );
+
+    const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+    const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    return (<BaseDialog className="mx_CryptoStoreTooNewDialog"
+        contentId='mx_Dialog_content'
+        title={_t("Incompatible Database")}
+        hasCancel={false}
+        onFinished={props.onFinished}
+    >
+        <div className="mx_Dialog_content" id='mx_Dialog_content'>
+            { description }
+        </div>
+        <DialogButtons primaryButton={_t('Continue With Encryption Disabled')}
+            hasCancel={false}
+            onPrimaryButtonClick={props.onFinished}
+        >
+            <button onClick={_onLogoutClicked} >
+                { _t('Sign out') }
+            </button>
+        </DialogButtons>
+    </BaseDialog>);
+};

From a25ae924b12d32a04237eb156a9f1e3286298b88 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 22 Nov 2018 16:49:20 +0000
Subject: [PATCH 213/218] js-sdk v0.14.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d2e54a2621..bf44460f80 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.13.1",
     "lolex": "2.3.2",
-    "matrix-js-sdk": "0.14.0",
+    "matrix-js-sdk": "0.14.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",

From e27a4af8179fc40c67c487dfda5e86c39e5f379b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 22 Nov 2018 16:54:21 +0000
Subject: [PATCH 214/218] Prepare changelog for v0.14.6

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1486578025..eea47dcb8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.14.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.6) (2018-11-22)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.5...v0.14.6)
+
+ * Warning when crypto DB is too new to use.
+
 Changes in [0.14.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.5) (2018-11-19)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.5-rc.2...v0.14.5)

From 60e22b7e0fdf7a117357b6a8813935c57cf2a090 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 22 Nov 2018 16:54:53 +0000
Subject: [PATCH 215/218] v0.14.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bf44460f80..b356c72d03 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From d443d6173dc5f4a2e23589d0138f7602f5196884 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 22 Nov 2018 19:06:58 +0000
Subject: [PATCH 216/218] Forgot to enable continue button on download

---
 src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 046f1d703e..2f43d18072 100644
--- a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -315,7 +315,7 @@ export default React.createClass({
             <DialogButtons primaryButton={_t("I've made a copy")}
                 onPrimaryButtonClick={this._createBackup}
                 hasCancel={false}
-                disabled={!this.state.copied}
+                disabled={!this.state.copied && !this.state.downloaded}
             />
         </div>;
     },

From 4f8c4f1c6eeddc82b633a37e52e7de84a7e987d0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 23 Nov 2018 10:55:18 +0000
Subject: [PATCH 217/218] Make create key backup dialog async

So we can add zxcvbn to it without inflating the main bundle size
---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js |  0
 .../dialogs/keybackup/RestoreKeyBackupDialog.js      | 10 ++++++++--
 src/components/views/settings/KeyBackupPanel.js      | 12 +++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)
 rename src/{components => async-components}/views/dialogs/keybackup/CreateKeyBackupDialog.js (100%)

diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
similarity index 100%
rename from src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
rename to src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 0cce968d34..fba9f0b714 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -59,8 +59,14 @@ export default React.createClass({
 
     _onResetRecoveryClick: function() {
         this.props.onFinished(false);
-        const CreateKeyBackupDialog = sdk.getComponent("dialogs.keybackup.CreateKeyBackupDialog");
-        Modal.createTrackedDialog('Create Key Backup', '', CreateKeyBackupDialog, {});
+        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
+            import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+            {
+                onFinished: () => {
+                    this._loadBackupStatus();
+                },
+            },
+        );
     },
 
     _onRecoveryKeyChange: function(e) {
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 83e78787e5..b08f4d0e78 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -80,12 +80,14 @@ export default class KeyBackupPanel extends React.Component {
     }
 
     _startNewBackup() {
-        const CreateKeyBackupDialog = sdk.getComponent('dialogs.keybackup.CreateKeyBackupDialog');
-        Modal.createTrackedDialog('Key Backup', 'Key Backup', CreateKeyBackupDialog, {
-            onFinished: () => {
-                this._loadBackupStatus();
+        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
+            import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+            {
+                onFinished: () => {
+                    this._loadBackupStatus();
+                },
             },
-        });
+        );
     }
 
     _deleteBackup() {

From 015af7d771673074161f7ab64aa413b02b176ebf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 27 Nov 2018 13:41:34 -0700
Subject: [PATCH 218/218] Use sensible logging

---
 src/components/structures/login/Login.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 6002f058f4..bd18699dd1 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -241,8 +241,7 @@ module.exports = React.createClass({
                 const url = new URL("https://" + serverName);
                 this._tryWellKnownDiscovery(url.hostname);
             } catch (e) {
-                console.error("Problem parsing URL or unhandled error doing .well-known discovery");
-                console.error(e);
+                console.error("Problem parsing URL or unhandled error doing .well-known discovery:", e);
                 this.setState({discoveryError: _t("Failed to perform homeserver discovery")});
             }
         }